diff --git a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityButtonController.xml b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityButtonController.xml
index d2c986b589..5fdb736b73 100644
--- a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityButtonController.xml
+++ b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityButtonController.xml
@@ -167,8 +167,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">the callback to add, must be non-null</param>
+        <param name="handler">To be added.</param>
         <summary>Registers the provided <c>AccessibilityButtonCallback</c> for interaction and state
             changes callbacks related to the accessibility button.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityService.xml b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityService.xml
index a72ad1fd09..84957a270d 100644
--- a/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityService.xml
+++ b/docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityService.xml
@@ -2332,13 +2332,15 @@
         <Parameter Name="displayId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="displayId">To be added.</param>
-        <summary>Returns the controller for the accessibility button within the system's navigation area.</summary>
+        <param name="displayId">The logic display id, use <c>Display#DEFAULT_DISPLAY</c> for default
+                             display.</param>
+        <summary>Returns the controller of specified logical display for the accessibility button within the
+            system's navigation area.</summary>
         <returns>the accessibility button controller for this <c>AccessibilityService</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#getAccessibilityButtonController()" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.getAccessibilityButtonController()</code>.</a>
+              <a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#getAccessibilityButtonController(int)" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.getAccessibilityButtonController(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3173,15 +3175,14 @@
         <Parameter Name="gestureEvent" Type="Android.AccessibilityServices.AccessibilityGestureEvent" />
       </Parameters>
       <Docs>
-        <param name="gestureEvent">To be added.</param>
-        <param name="gestureId">The unique id of the performed gesture.</param>
-        <summary>Called by <c>#onGesture(AccessibilityGestureEvent)</c> when the user performs a specific
-            gesture on the default display.</summary>
+        <param name="gestureEvent">The information of gesture.</param>
+        <summary>Called by the system when the user performs a specific gesture on the
+            specific touch screen.</summary>
         <returns>Whether the gesture was handled.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#onGesture(int)" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.onGesture(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#onGesture(android.accessibilityservice.AccessibilityGestureEvent)" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.onGesture(android.accessibilityservice.AccessibilityGestureEvent)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Accounts/AccountManager.xml b/docs/Mono.Android/en/Android.Accounts/AccountManager.xml
index 974c19338b..1d872ee2c8 100644
--- a/docs/Mono.Android/en/Android.Accounts/AccountManager.xml
+++ b/docs/Mono.Android/en/Android.Accounts/AccountManager.xml
@@ -304,19 +304,18 @@
         <Parameter Name="visibility" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Integer&gt;" />
       </Parameters>
       <Docs>
-        <param name="extras">To be added.</param>
-        <param name="visibility">To be added.</param>
         <param name="account">The <c>Account</c> to add</param>
         <param name="password">The password to associate with the account, null for none</param>
-        <param name="userdata">String values to use for the account's userdata, null for
-                       none</param>
+        <param name="extras">String values to use for the account's userdata, null for none</param>
+        <param name="visibility">Map from packageName to visibility values which will be set before account
+                   is added. See <c>#getAccountVisibility</c> for possible values.</param>
         <summary>Adds an account directly to the AccountManager.</summary>
-        <returns>True if the account was successfully added, false if the account
-                    already exists, the account is null, the user is locked, or another error occurs.</returns>
+        <returns>True if the account was successfully added, false if the account already exists, the
+                    account is null, or another error occurs.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accounts/AccountManager#addAccountExplicitly(android.accounts.Account,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/accounts/AccountManager#addAccountExplicitly(android.accounts.Account,%20java.lang.String,%20android.os.Bundle,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -407,15 +406,18 @@
         <Parameter Name="accountTypes" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
-        <param name="handler">To be added.</param>
-        <param name="updateImmediately">To be added.</param>
-        <param name="accountTypes">To be added.</param>
+        <param name="listener">The listener to send notifications to</param>
+        <param name="handler">
+          <c>Handler</c> identifying the thread to use for notifications, null for the
+                   main thread</param>
+        <param name="updateImmediately">If true, the listener will be invoked (on the handler thread) right
+                   away with the current account list</param>
+        <param name="accountTypes">If set, only changes to accounts of given types will be reported.</param>
         <summary>Adds an <c>OnAccountsUpdateListener</c> to this instance of the <c>AccountManager</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accounts/AccountManager#addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener,%20android.os.Handler,%20boolean)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/accounts/AccountManager#addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener,%20android.os.Handler,%20boolean,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1495,32 +1497,31 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="notifyAuthFailure">To be added.</param>
         <param name="account">The account to fetch an auth token for</param>
         <param name="authTokenType">The auth token type, an authenticator-dependent
                 string token, must not be null</param>
-        <param name="options">Authenticator-specific options for the request,
-                may be null or empty</param>
-        <param name="activity">The <c>Activity</c> context to use for launching a new
-                authenticator-defined sub-Activity to prompt the user for a password
-                if necessary; used only to call startActivity(); must not be null.</param>
+        <param name="notifyAuthFailure">True to add a notification to prompt the
+                user for a password if necessary, false to leave that to the caller</param>
         <param name="callback">Callback to invoke when the request completes,
                 null for no callback</param>
         <param name="handler">
           <c>Handler</c> identifying the callback thread,
                 null for the main thread</param>
         <summary>Gets an auth token of the specified type for a particular account,
-            prompting the user for credentials if necessary.</summary>
+            optionally raising a notification if the user must enter credentials.</summary>
         <returns>An <c>AccountManagerFuture</c> which resolves to a Bundle with
-                at least the following fields:
+                at least the following fields on success:
             &lt;ul&gt;
             &lt;li&gt; <c>#KEY_ACCOUNT_NAME</c> - the name of the account you supplied
             &lt;li&gt; <c>#KEY_ACCOUNT_TYPE</c> - the type of the account
             &lt;li&gt; <c>#KEY_AUTHTOKEN</c> - the auth token you wanted
             &lt;/ul&gt;
             
-            (Other authenticator-specific values may be returned.)  If an auth token
-            could not be fetched, <c>AccountManagerFuture#getResult()</c> throws:
+            (Other authenticator-specific values may be returned.)  If the user
+            must enter credentials, the returned Bundle contains only
+            <c>#KEY_INTENT</c> with the <c>Intent</c> needed to launch a prompt.
+            
+            If an error occurred, <c>AccountManagerFuture#getResult()</c> throws:
             &lt;ul&gt;
             &lt;li&gt; <c>AuthenticatorException</c> if the authenticator failed to respond
             &lt;li&gt; <c>OperationCanceledException</c> if the operation is canceled for
@@ -1534,7 +1535,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accounts/AccountManager#getAuthToken(android.accounts.Account,%20java.lang.String,%20android.os.Bundle,%20android.app.Activity,%20android.accounts.AccountManagerCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback, android.os.Handler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/accounts/AccountManager#getAuthToken(android.accounts.Account,%20java.lang.String,%20boolean,%20android.accounts.AccountManagerCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -1658,32 +1659,33 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="notifyAuthFailure">To be added.</param>
         <param name="account">The account to fetch an auth token for</param>
         <param name="authTokenType">The auth token type, an authenticator-dependent
                 string token, must not be null</param>
         <param name="options">Authenticator-specific options for the request,
                 may be null or empty</param>
-        <param name="activity">The <c>Activity</c> context to use for launching a new
-                authenticator-defined sub-Activity to prompt the user for a password
-                if necessary; used only to call startActivity(); must not be null.</param>
+        <param name="notifyAuthFailure">True to add a notification to prompt the
+                user for a password if necessary, false to leave that to the caller</param>
         <param name="callback">Callback to invoke when the request completes,
                 null for no callback</param>
         <param name="handler">
           <c>Handler</c> identifying the callback thread,
                 null for the main thread</param>
         <summary>Gets an auth token of the specified type for a particular account,
-            prompting the user for credentials if necessary.</summary>
+            optionally raising a notification if the user must enter credentials.</summary>
         <returns>An <c>AccountManagerFuture</c> which resolves to a Bundle with
-                at least the following fields:
+                at least the following fields on success:
             &lt;ul&gt;
             &lt;li&gt; <c>#KEY_ACCOUNT_NAME</c> - the name of the account you supplied
             &lt;li&gt; <c>#KEY_ACCOUNT_TYPE</c> - the type of the account
             &lt;li&gt; <c>#KEY_AUTHTOKEN</c> - the auth token you wanted
             &lt;/ul&gt;
             
-            (Other authenticator-specific values may be returned.)  If an auth token
-            could not be fetched, <c>AccountManagerFuture#getResult()</c> throws:
+            (Other authenticator-specific values may be returned.)  If the user
+            must enter credentials, the returned Bundle contains only
+            <c>#KEY_INTENT</c> with the <c>Intent</c> needed to launch a prompt.
+            
+            If an error occurred, <c>AccountManagerFuture#getResult()</c> throws:
             &lt;ul&gt;
             &lt;li&gt; <c>AuthenticatorException</c> if the authenticator failed to respond
             &lt;li&gt; <c>OperationCanceledException</c> if the operation is canceled for
@@ -1697,7 +1699,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accounts/AccountManager#getAuthToken(android.accounts.Account,%20java.lang.String,%20android.os.Bundle,%20android.app.Activity,%20android.accounts.AccountManagerCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback, android.os.Handler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/accounts/AccountManager#getAuthToken(android.accounts.Account,%20java.lang.String,%20android.os.Bundle,%20boolean,%20android.accounts.AccountManagerCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -2901,7 +2903,6 @@
             both to filter the shown accounts and to filter the list of account types that are shown
             when adding an account. If not specified then this field will not limit the displayed
             account types when adding an account.</param>
-        <param name="alwaysPromptForAccount">boolean that is ignored.</param>
         <param name="descriptionOverrideText">if non-null this string is used as the description in the
             accounts chooser screen rather than the default</param>
         <param name="addAccountAuthTokenType">this string is passed as the <c>#addAccount</c>
@@ -2910,13 +2911,13 @@
             requiredFeatures parameter</param>
         <param name="addAccountOptions">This <c>Bundle</c> is passed as the <c>#addAccount</c> options
             parameter</param>
-        <summary>Deprecated in favor of <c>#newChooseAccountIntent(Account, List, String[], String,
-            String, String[], Bundle)</c>.</summary>
+        <summary>Returns an intent to an <c>Activity</c> that prompts the user to choose from a list of
+            accounts.</summary>
         <returns>an <c>Intent</c> that can be used to launch the ChooseAccount activity flow.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accounts/AccountManager#newChooseAccountIntent(android.accounts.Account,%20java.util.ArrayList,%20java.lang.String[],%20boolean,%20java.lang.String,%20java.lang.String,%20java.lang.String[],%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.newChooseAccountIntent(android.accounts.Account, java.util.ArrayList, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/accounts/AccountManager#newChooseAccountIntent(android.accounts.Account,%20java.util.List,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String[],%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.newChooseAccountIntent(android.accounts.Account, java.util.List, java.lang.String[], java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -3248,20 +3249,36 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="activity">To be added.</param>
         <param name="account">The <c>Account</c> to remove</param>
+        <param name="activity">The <c>Activity</c> context to use for launching a new
+                authenticator-defined sub-Activity to prompt the user to delete an
+                account; used only to call startActivity(); if null, the prompt
+                will not be launched directly, but the <c>Intent</c> may be
+                returned to the caller instead</param>
         <param name="callback">Callback to invoke when the request completes,
                 null for no callback</param>
         <param name="handler">
           <c>Handler</c> identifying the callback thread,
                 null for the main thread</param>
         <summary>Removes an account from the AccountManager.</summary>
-        <returns>An <c>AccountManagerFuture</c> which resolves to a Boolean,
-                true if the account has been successfully removed</returns>
+        <returns>An <c>AccountManagerFuture</c> which resolves to a Bundle with
+                <c>#KEY_BOOLEAN_RESULT</c> if activity was specified and an account
+                was removed or if active. If no activity was specified, the returned
+                Bundle contains only <c>#KEY_INTENT</c> with the <c>Intent</c>
+                needed to launch the actual account removal process, if authenticator
+                needs the activity launch. If an error occurred,
+                <c>AccountManagerFuture#getResult()</c> throws:
+            &lt;ul&gt;
+            &lt;li&gt; <c>AuthenticatorException</c> if no authenticator was registered for
+                 this account type or the authenticator failed to respond
+            &lt;li&gt; <c>OperationCanceledException</c> if the operation was canceled for
+                 any reason, including the user canceling the creation process or
+                 adding accounts (of this type) has been disabled by policy
+            &lt;/ul&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accounts/AccountManager#removeAccount(android.accounts.Account,%20android.accounts.AccountManagerCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback, android.os.Handler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/accounts/AccountManager#removeAccount(android.accounts.Account,%20android.app.Activity,%20android.accounts.AccountManagerCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManager.removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Accounts/IAccountManagerFuture.xml b/docs/Mono.Android/en/Android.Accounts/IAccountManagerFuture.xml
index 220f5bc6b0..5b6700620f 100644
--- a/docs/Mono.Android/en/Android.Accounts/IAccountManagerFuture.xml
+++ b/docs/Mono.Android/en/Android.Accounts/IAccountManagerFuture.xml
@@ -124,7 +124,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/accounts/AccountManagerFuture#getResult()" title="Reference documentation">Java documentation for <code>android.accounts.AccountManagerFuture.getResult()</code>.</a>
+              <a href="https://developer.android.com/reference/android/accounts/AccountManagerFuture#getResult(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManagerFuture.getResult(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/AnimatorSet.xml b/docs/Mono.Android/en/Android.Animation/AnimatorSet.xml
index 4fc3f7cbbc..8f8457a4e0 100644
--- a/docs/Mono.Android/en/Android.Animation/AnimatorSet.xml
+++ b/docs/Mono.Android/en/Android.Animation/AnimatorSet.xml
@@ -366,7 +366,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/AnimatorSet#playSequentially(android.animation.Animator)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playSequentially(android.animation.Animator)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/AnimatorSet#playSequentially(java.util.List)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playSequentially(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -451,7 +451,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/AnimatorSet#playTogether(android.animation.Animator)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playTogether(android.animation.Animator)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/AnimatorSet#playTogether(java.util.Collection)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playTogether(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml b/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml
index c8b9f5861a..2c10bafed5 100644
--- a/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml
@@ -95,12 +95,12 @@
         <Parameter Name="reuseArray" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="reuseArray">To be added.</param>
-        <summary>Create a FloatArrayEvaluator that does not reuse the animated value.</summary>
+        <param name="reuseArray">The array to modify and return from &lt;code&gt;evaluate&lt;/code&gt;.</param>
+        <summary>Create a FloatArrayEvaluator that reuses &lt;code&gt;reuseArray&lt;/code&gt; for every evaluate() call.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/FloatArrayEvaluator#FloatArrayEvaluator()" title="Reference documentation">Java documentation for <code>android.animation.FloatArrayEvaluator.FloatArrayEvaluator()</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/FloatArrayEvaluator#FloatArrayEvaluator(float[])" title="Reference documentation">Java documentation for <code>android.animation.FloatArrayEvaluator.FloatArrayEvaluator(float[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml b/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml
index 8bc0ed1415..40f0c1e6d5 100644
--- a/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml
@@ -95,12 +95,12 @@
         <Parameter Name="reuseArray" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="reuseArray">To be added.</param>
-        <summary>Create an IntArrayEvaluator that does not reuse the animated value.</summary>
+        <param name="reuseArray">The array to modify and return from &lt;code&gt;evaluate&lt;/code&gt;.</param>
+        <summary>Create an IntArrayEvaluator that reuses &lt;code&gt;reuseArray&lt;/code&gt; for every evaluate() call.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/IntArrayEvaluator#IntArrayEvaluator()" title="Reference documentation">Java documentation for <code>android.animation.IntArrayEvaluator.IntArrayEvaluator()</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/IntArrayEvaluator#IntArrayEvaluator(int[])" title="Reference documentation">Java documentation for <code>android.animation.IntArrayEvaluator.IntArrayEvaluator(int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/Keyframe.xml b/docs/Mono.Android/en/Android.Animation/Keyframe.xml
index 052c26dbdd..05e75e31de 100644
--- a/docs/Mono.Android/en/Android.Animation/Keyframe.xml
+++ b/docs/Mono.Android/en/Android.Animation/Keyframe.xml
@@ -237,8 +237,7 @@
       </ReturnValue>
       <Docs>
         <summary>Gets the optional interpolator for this Keyframe. -or- Sets the optional interpolator for this Keyframe.</summary>
-        <value>The optional interpolator for this Keyframe.</value>
-        <value>The optional interpolator for this Keyframe.</value>
+        <returns>The optional interpolator for this Keyframe.</returns>
         <remarks>
           <para>Property getter documentation:</para>
           <para>
@@ -361,18 +360,17 @@
         <Parameter Name="value" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="value">The value that the object will animate to as the animation time approaches
- the time in this keyframe, and the the value animated from as the time passes the time in
- this keyframe.
-</param>
         <param name="fraction">The time, expressed as a value between 0 and 1, representing the fraction
             of time elapsed of the overall animation duration.</param>
-        <summary>Constructs a Keyframe object with the given time.</summary>
+        <param name="value">The value that the object will animate to as the animation time approaches
+            the time in this keyframe, and the value animated from as the time passes the time in
+            this keyframe.</param>
+        <summary>Constructs a Keyframe object with the given time and value.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/Keyframe#ofFloat(float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofFloat(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/Keyframe#ofFloat(float,%20float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofFloat(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -450,18 +448,17 @@
         <Parameter Name="value" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="value">The value that the object will animate to as the animation time approaches
- the time in this keyframe, and the the value animated from as the time passes the time in
- this keyframe.
-</param>
         <param name="fraction">The time, expressed as a value between 0 and 1, representing the fraction
             of time elapsed of the overall animation duration.</param>
-        <summary>Constructs a Keyframe object with the given time.</summary>
+        <param name="value">The value that the object will animate to as the animation time approaches
+            the time in this keyframe, and the value animated from as the time passes the time in
+            this keyframe.</param>
+        <summary>Constructs a Keyframe object with the given time and value.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/Keyframe#ofInt(float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofInt(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/Keyframe#ofInt(float,%20int)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofInt(float, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -539,18 +536,17 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">The value that the object will animate to as the animation time approaches
- the time in this keyframe, and the the value animated from as the time passes the time in
- this keyframe.
-</param>
         <param name="fraction">The time, expressed as a value between 0 and 1, representing the fraction
             of time elapsed of the overall animation duration.</param>
-        <summary>Constructs a Keyframe object with the given time.</summary>
+        <param name="value">The value that the object will animate to as the animation time approaches
+            the time in this keyframe, and the value animated from as the time passes the time in
+            this keyframe.</param>
+        <summary>Constructs a Keyframe object with the given time and value.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/Keyframe#ofObject(float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofObject(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/Keyframe#ofObject(float,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofObject(float, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml b/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml
index 74e04b891c..84a84be933 100644
--- a/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml
+++ b/docs/Mono.Android/en/Android.Animation/LayoutTransition.xml
@@ -833,14 +833,13 @@
         <param name="parent">The parent ViewGroup of the View being hidden.</param>
         <param name="child">The View being hidden.</param>
         <param name="newVisibility">The new visibility value of the child View, either
- <see cref="F:Android.Views.ViewStates.Gone" tool="ReplaceLinkValue" /> or <see cref="F:Android.Views.ViewStates.Invisible" tool="ReplaceLinkValue" />.
-</param>
+            <c>View#GONE</c> or <c>View#INVISIBLE</c>.</param>
         <summary>This method is called by ViewGroup when a child view is about to be hidden in
- container.</summary>
+            container.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/LayoutTransition#hideChild(android.view.ViewGroup,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.animation.LayoutTransition.hideChild(android.view.ViewGroup, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/LayoutTransition#hideChild(android.view.ViewGroup,%20android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.animation.LayoutTransition.hideChild(android.view.ViewGroup, android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1207,15 +1206,13 @@
         <Parameter Name="duration" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="transitionType">One of <c>#CHANGE_APPEARING</c>, <c>#CHANGE_DISAPPEARING</c>,
-            <c>#CHANGING</c>, <c>#APPEARING</c>, or <c>#DISAPPEARING</c>, which determines
-            the animation whose duration is being set.</param>
-        <param name="duration">The length of time, in milliseconds, that the specified animation should run.</param>
-        <summary>Sets the duration on one of the animation objects used by this transition.</summary>
+        <param name="duration">The length of time, in milliseconds, that the transition animations
+            should last.</param>
+        <summary>Sets the duration to be used by all animations of this transition object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/LayoutTransition#setDuration(int,%20long)" title="Reference documentation">Java documentation for <code>android.animation.LayoutTransition.setDuration(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/LayoutTransition#setDuration(long)" title="Reference documentation">Java documentation for <code>android.animation.LayoutTransition.setDuration(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1517,14 +1514,13 @@
         <param name="parent">The ViewGroup in which the View is being made visible.</param>
         <param name="child">The View being made visible.</param>
         <param name="oldVisibility">The previous visibility value of the child View, either
- <see cref="F:Android.Views.ViewStates.Gone" tool="ReplaceLinkValue" /> or <see cref="F:Android.Views.ViewStates.Invisible" tool="ReplaceLinkValue" />.
-</param>
+            <c>View#GONE</c> or <c>View#INVISIBLE</c>.</param>
         <summary>This method is called by ViewGroup when a child view is about to be made visible in the
- container.</summary>
+            container.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/LayoutTransition#showChild(android.view.ViewGroup,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.animation.LayoutTransition.showChild(android.view.ViewGroup, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/LayoutTransition#showChild(android.view.ViewGroup,%20android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.animation.LayoutTransition.showChild(android.view.ViewGroup, android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml b/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml
index 811aa2b33c..b1334f670e 100644
--- a/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml
+++ b/docs/Mono.Android/en/Android.Animation/ObjectAnimator.xml
@@ -138,7 +138,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofArgb(java.lang.Object,%20android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofArgb(java.lang.Object, android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofArgb(java.lang.Object,%20android.util.Property,%20int[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofArgb(java.lang.Object, android.util.Property, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -181,16 +181,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
+        <param name="target">The object whose property is to be animated. This object should
+            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
+            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+        <param name="propertyName">The name of the property being animated.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
         <summary>Constructs and returns an ObjectAnimator that animates between color values.</summary>
         <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofArgb(java.lang.Object,%20android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofArgb(java.lang.Object, android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofArgb(java.lang.Object,%20java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofArgb(java.lang.Object, java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -245,7 +246,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20android.util.Property,%20float)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, android.util.Property, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20android.util.Property,%20float[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, android.util.Property, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -289,16 +290,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
+        <param name="target">The object whose property is to be animated. This object should
+            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
+            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+        <param name="propertyName">The name of the property being animated.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
         <summary>Constructs and returns an ObjectAnimator that animates between float values.</summary>
         <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20android.util.Property,%20float)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, android.util.Property, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20java.lang.String,%20float[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, java.lang.String, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -339,18 +341,17 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="xProperty">To be added.</param>
-        <param name="yProperty">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates between float values.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="target">The object whose properties are to be animated.</param>
+        <param name="xProperty">The property for the x coordinate being animated.</param>
+        <param name="yProperty">The property for the y coordinate being animated.</param>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+            using two properties.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20android.util.Property,%20float)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, android.util.Property, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20android.util.Property,%20android.util.Property,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, android.util.Property, android.util.Property, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -387,18 +388,21 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
+        <param name="target">The object whose properties are to be animated. This object should
+                          have public methods on it called &lt;code&gt;setNameX()&lt;/code&gt; and
+                          &lt;code&gt;setNameY&lt;/code&gt;, where &lt;code&gt;nameX&lt;/code&gt; and &lt;code&gt;nameY&lt;/code&gt;
+                          are the value of the &lt;code&gt;xPropertyName&lt;/code&gt; and &lt;code&gt;yPropertyName&lt;/code&gt;
+                          parameters, respectively.</param>
         <param name="xPropertyName">The name of the property for the x coordinate being animated.</param>
         <param name="yPropertyName">The name of the property for the y coordinate being animated.</param>
-        <param name="path">The <c>Path</c> to animate values along.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates between float values.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+            using two properties.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20android.util.Property,%20float)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, android.util.Property, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(java.lang.Object,%20java.lang.String,%20java.lang.String,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofFloat(java.lang.Object, java.lang.String, java.lang.String, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -453,7 +457,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20android.util.Property,%20int[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, android.util.Property, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -496,16 +500,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
+        <param name="target">The object whose property is to be animated. This object should
+            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
+            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+        <param name="propertyName">The name of the property being animated.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
         <summary>Constructs and returns an ObjectAnimator that animates between int values.</summary>
         <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -546,18 +551,17 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="xProperty">To be added.</param>
-        <param name="yProperty">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates between int values.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="target">The object whose properties are to be animated.</param>
+        <param name="xProperty">The property for the x coordinate being animated.</param>
+        <param name="yProperty">The property for the y coordinate being animated.</param>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+            using two properties.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20android.util.Property,%20android.util.Property,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, android.util.Property, android.util.Property, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -594,18 +598,21 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
+        <param name="target">The object whose properties are to be animated. This object should
+                          have public methods on it called &lt;code&gt;setNameX()&lt;/code&gt; and
+                          &lt;code&gt;setNameY&lt;/code&gt;, where &lt;code&gt;nameX&lt;/code&gt; and &lt;code&gt;nameY&lt;/code&gt;
+                          are the value of &lt;code&gt;xPropertyName&lt;/code&gt; and &lt;code&gt;yPropertyName&lt;/code&gt;
+                          parameters, respectively.</param>
         <param name="xPropertyName">The name of the property for the x coordinate being animated.</param>
         <param name="yPropertyName">The name of the property for the y coordinate being animated.</param>
-        <param name="path">The <c>Path</c> to animate values along.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates between int values.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates coordinates along a &lt;code&gt;Path&lt;/code&gt;
+            using two properties.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofInt(java.lang.Object,%20java.lang.String,%20java.lang.String,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofInt(java.lang.Object, java.lang.String, java.lang.String, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -641,24 +648,19 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="path">The <c>Path</c> to animate values along.</param>
         <param name="target">The object whose property is to be animated. This object may
             have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
             the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
-        <param name="converter">Converts T objects into float parameters for the multi-value setter.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates over values for a multiple float
-            parameters setter.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates the target using a multi-float setter
+            along the given &lt;code&gt;Path&lt;/code&gt;.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiFloat(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiFloat(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiFloat(java.lang.Object,%20java.lang.String,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiFloat(java.lang.Object, java.lang.String, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -699,18 +701,14 @@
             the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
-        <param name="converter">Converts T objects into float parameters for the multi-value setter.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates over values for a multiple float
+        <summary>Constructs and returns an ObjectAnimator that animates over float values for a multiple
             parameters setter.</summary>
         <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiFloat(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiFloat(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiFloat(java.lang.Object,%20java.lang.String,%20float[][])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiFloat(java.lang.Object, java.lang.String, float[][])</code>.</a>
             </format>
           </para>
           <para>
@@ -775,7 +773,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiFloat(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiFloat(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiFloat(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiFloat(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -811,24 +809,19 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="path">The <c>Path</c> to animate values along.</param>
         <param name="target">The object whose property is to be animated. This object may
             have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
             the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
-        <param name="converter">Converts T objects into int parameters for the multi-value setter.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates over values for a multiple int
-            parameters setter.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates the target using a multi-int setter
+            along the given &lt;code&gt;Path&lt;/code&gt;.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiInt(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiInt(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiInt(java.lang.Object,%20java.lang.String,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiInt(java.lang.Object, java.lang.String, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -869,18 +862,14 @@
             the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter. &lt;code&gt;propertyName&lt;/code&gt; may also
             be the case-sensitive complete name of the public setter method.</param>
         <param name="propertyName">The name of the property being animated or the name of the setter method.</param>
-        <param name="converter">Converts T objects into int parameters for the multi-value setter.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
         <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates over values for a multiple int
+        <summary>Constructs and returns an ObjectAnimator that animates over int values for a multiple
             parameters setter.</summary>
         <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiInt(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiInt(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiInt(java.lang.Object,%20java.lang.String,%20int[][])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiInt(java.lang.Object, java.lang.String, int[][])</code>.</a>
             </format>
           </para>
           <para>
@@ -945,7 +934,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiInt(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiInt(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofMultiInt(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofMultiInt(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -995,7 +984,6 @@
       <Docs>
         <param name="target">The object whose property is to be animated.</param>
         <param name="property">The property being animated.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
         <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
             provide the necessary interpolation between the Object values to derive the animated
             value.</param>
@@ -1005,7 +993,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20android.util.Property,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, android.util.Property, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1046,20 +1034,17 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
         <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates between Object values.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="property">The property being animated. Should not be null.</param>
+        <param name="converter">Converts a PointF to the type associated with the setter. May be
+                             null if conversion is unnecessary.</param>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates a property along a &lt;code&gt;Path&lt;/code&gt;.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20android.util.Property,%20android.animation.TypeConverter,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, android.util.Property, android.animation.TypeConverter, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -1103,10 +1088,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
         <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
+        <param name="propertyName">To be added.</param>
         <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
             provide the necessary interpolation between the Object values to derive the animated
             value.</param>
@@ -1153,21 +1136,19 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="target">The object whose property is to be animated.</param>
-        <param name="property">The property being animated.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
-        <param name="values">A set of values that the animation will animate between over time.</param>
-        <summary>Constructs and returns an ObjectAnimator that animates between Object values.</summary>
-        <returns>An ObjectAnimator object that is set up to animate between the given values.</returns>
+        <param name="target">The object whose property is to be animated. This object should
+            have a public method on it called &lt;code&gt;setName()&lt;/code&gt;, where &lt;code&gt;name&lt;/code&gt; is
+            the value of the &lt;code&gt;propertyName&lt;/code&gt; parameter.</param>
+        <param name="propertyName">The name of the property being animated.</param>
+        <param name="converter">Converts a PointF to the type associated with the setter. May be
+                             null if conversion is unnecessary.</param>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to animate values along.</param>
+        <summary>Constructs and returns an ObjectAnimator that animates a property along a &lt;code&gt;Path&lt;/code&gt;.</summary>
+        <returns>An ObjectAnimator object that is set up to animate along &lt;code&gt;path&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20java.lang.String,%20android.animation.TypeConverter,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, java.lang.String, android.animation.TypeConverter, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -1228,7 +1209,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ObjectAnimator#ofObject(java.lang.Object,%20android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.ObjectAnimator.ofObject(java.lang.Object, android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml b/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml
index f0e0ac790d..9c28d4227e 100644
--- a/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/PointFEvaluator.xml
@@ -98,12 +98,13 @@
         <Parameter Name="reuse" Type="Android.Graphics.PointF" />
       </Parameters>
       <Docs>
-        <param name="reuse">To be added.</param>
-        <summary>Construct a PointFEvaluator that returns a new PointF on every evaluate call.</summary>
+        <param name="reuse">A PointF to be modified and returned by evaluate.</param>
+        <summary>Constructs a PointFEvaluator that modifies and returns &lt;code&gt;reuse&lt;/code&gt;
+            in <c>#evaluate(float, android.graphics.PointF, android.graphics.PointF)</c> calls.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PointFEvaluator#PointFEvaluator()" title="Reference documentation">Java documentation for <code>android.animation.PointFEvaluator.PointFEvaluator()</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PointFEvaluator#PointFEvaluator(android.graphics.PointF)" title="Reference documentation">Java documentation for <code>android.animation.PointFEvaluator.PointFEvaluator(android.graphics.PointF)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml b/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml
index 955dbd9e14..f76dc6b4e7 100644
--- a/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml
+++ b/docs/Mono.Android/en/Android.Animation/PropertyValuesHolder.xml
@@ -173,7 +173,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofFloat(android.util.Property,%20float)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofFloat(android.util.Property, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofFloat(android.util.Property,%20float[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofFloat(android.util.Property, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -215,16 +215,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <param name="property">The property being animated. Should not be null.</param>
-        <param name="values">The values that the property will animate between.</param>
-        <summary>Constructs and returns a PropertyValuesHolder with a given property and
+        <param name="propertyName">The name of the property being animated.</param>
+        <param name="values">The values that the named property will animate between.</param>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property name and
             set of float values.</summary>
         <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofFloat(android.util.Property,%20float)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofFloat(android.util.Property, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofFloat(java.lang.String,%20float[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofFloat(java.lang.String, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -274,7 +273,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofInt(android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofInt(android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofInt(android.util.Property,%20int[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofInt(android.util.Property, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -316,16 +315,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <param name="property">The property being animated. Should not be null.</param>
-        <param name="values">The values that the property will animate between.</param>
-        <summary>Constructs and returns a PropertyValuesHolder with a given property and
+        <param name="propertyName">The name of the property being animated.</param>
+        <param name="values">The values that the named property will animate between.</param>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property name and
             set of int values.</summary>
         <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofInt(android.util.Property,%20int)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofInt(android.util.Property, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofInt(java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofInt(java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -418,7 +416,6 @@
       </Parameters>
       <Docs>
         <param name="propertyName">To be added.</param>
-        <param name="property">The property associated with this set of values. Should not be null.</param>
         <param name="values">The set of values to animate between.</param>
         <summary>Constructs and returns a PropertyValuesHolder object with the specified property and set
             of values.</summary>
@@ -461,20 +458,17 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
+        <param name="propertyName">The name of the property being animated. Can also be the
+                                case-sensitive name of the entire setter method. Should not be null.
+                                The setter must take exactly two &lt;code&gt;float&lt;/code&gt; parameters.</param>
         <param name="path">The Path along which the values should be animated.</param>
-        <param name="propertyName">The name of the property to associate with the set of values. This
-                                may also be the complete name of a setter function.</param>
-        <param name="converter">Converts &lt;code&gt;values&lt;/code&gt; into float parameters for the setter.
-                                Can be null if the Keyframes have float[] values.</param>
-        <param name="evaluator">Used to interpolate between values.</param>
-        <param name="values">The values at specific fractional times to evaluate between</param>
-        <summary>Constructs and returns a PropertyValuesHolder object with the specified property name or
-            setter name for use in a multi-float setter function using ObjectAnimator.</summary>
-        <returns>A PropertyValuesHolder for a multi-float parameter setter.</returns>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property name to use
+            as a multi-float setter.</summary>
+        <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiFloat(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20android.animation.Keyframe)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiFloat(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, android.animation.Keyframe)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiFloat(java.lang.String,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiFloat(java.lang.String, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -509,19 +503,16 @@
         <Parameter Name="values" Type="System.Single[][]" />
       </Parameters>
       <Docs>
-        <param name="propertyName">The name of the property to associate with the set of values. This
-                                may also be the complete name of a setter function.</param>
-        <param name="converter">Converts &lt;code&gt;values&lt;/code&gt; into float parameters for the setter.
-                                Can be null if the Keyframes have float[] values.</param>
-        <param name="evaluator">Used to interpolate between values.</param>
-        <param name="values">The values at specific fractional times to evaluate between</param>
-        <summary>Constructs and returns a PropertyValuesHolder object with the specified property name or
-            setter name for use in a multi-float setter function using ObjectAnimator.</summary>
-        <returns>A PropertyValuesHolder for a multi-float parameter setter.</returns>
+        <param name="propertyName">The name of the property being animated. Can also be the
+                                case-sensitive name of the entire setter method. Should not be null.</param>
+        <param name="values">The values that the property will animate between.</param>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property name and
+            set of &lt;code&gt;float[]&lt;/code&gt; values.</summary>
+        <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiFloat(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20android.animation.Keyframe)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiFloat(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, android.animation.Keyframe)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiFloat(java.lang.String,%20float[][])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiFloat(java.lang.String, float[][])</code>.</a>
             </format>
           </para>
           <para>
@@ -630,19 +621,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">The name of the property to associate with the set of values. This
-                                may also be the complete name of a setter function.</param>
-        <param name="converter">Converts &lt;code&gt;values&lt;/code&gt; into float parameters for the setter.
-                                Can be null if the Keyframes have float[] values.</param>
-        <param name="evaluator">Used to interpolate between values.</param>
-        <param name="values">The values at specific fractional times to evaluate between</param>
-        <summary>Constructs and returns a PropertyValuesHolder object with the specified property name or
-            setter name for use in a multi-float setter function using ObjectAnimator.</summary>
-        <returns>A PropertyValuesHolder for a multi-float parameter setter.</returns>
+        <param name="propertyName">The property being animated or complete name of the setter.
+                                Should not be null.</param>
+        <param name="converter">Used to convert the animated value to setter parameters.</param>
+        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
+            provide the necessary interpolation between the Object values to derive the animated
+            value.</param>
+        <param name="values">The values that the property will animate between.</param>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property and
+            set of Object values for use with ObjectAnimator multi-value setters.</summary>
+        <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiFloat(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20android.animation.Keyframe)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiFloat(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, android.animation.Keyframe)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiFloat(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiFloat(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -677,20 +669,17 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
+        <param name="propertyName">The name of the property being animated. Can also be the
+                                case-sensitive name of the entire setter method. Should not be null.
+                                The setter must take exactly two &lt;code&gt;int&lt;/code&gt; parameters.</param>
         <param name="path">The Path along which the values should be animated.</param>
-        <param name="propertyName">The name of the property to associate with the set of values. This
-                                may also be the complete name of a setter function.</param>
-        <param name="converter">Converts &lt;code&gt;values&lt;/code&gt; into int parameters for the setter.
-                                Can be null if the Keyframes have int[] values.</param>
-        <param name="evaluator">Used to interpolate between values.</param>
-        <param name="values">The values at specific fractional times to evaluate between</param>
-        <summary>Constructs and returns a PropertyValuesHolder object with the specified property name or
-            setter name for use in a multi-int setter function using ObjectAnimator.</summary>
-        <returns>A PropertyValuesHolder for a multi-int parameter setter.</returns>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property name to use
+            as a multi-int setter.</summary>
+        <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiInt(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20android.animation.Keyframe)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiInt(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, android.animation.Keyframe)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiInt(java.lang.String,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiInt(java.lang.String, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -725,19 +714,16 @@
         <Parameter Name="values" Type="System.Int32[][]" />
       </Parameters>
       <Docs>
-        <param name="propertyName">The name of the property to associate with the set of values. This
-                                may also be the complete name of a setter function.</param>
-        <param name="converter">Converts &lt;code&gt;values&lt;/code&gt; into int parameters for the setter.
-                                Can be null if the Keyframes have int[] values.</param>
-        <param name="evaluator">Used to interpolate between values.</param>
-        <param name="values">The values at specific fractional times to evaluate between</param>
-        <summary>Constructs and returns a PropertyValuesHolder object with the specified property name or
-            setter name for use in a multi-int setter function using ObjectAnimator.</summary>
-        <returns>A PropertyValuesHolder for a multi-int parameter setter.</returns>
+        <param name="propertyName">The name of the property being animated. Can also be the
+                                case-sensitive name of the entire setter method. Should not be null.</param>
+        <param name="values">The values that the property will animate between.</param>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property name and
+            set of &lt;code&gt;int[]&lt;/code&gt; values.</summary>
+        <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiInt(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20android.animation.Keyframe)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiInt(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, android.animation.Keyframe)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiInt(java.lang.String,%20int[][])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiInt(java.lang.String, int[][])</code>.</a>
             </format>
           </para>
           <para>
@@ -846,19 +832,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="propertyName">The name of the property to associate with the set of values. This
-                                may also be the complete name of a setter function.</param>
-        <param name="converter">Converts &lt;code&gt;values&lt;/code&gt; into int parameters for the setter.
-                                Can be null if the Keyframes have int[] values.</param>
-        <param name="evaluator">Used to interpolate between values.</param>
-        <param name="values">The values at specific fractional times to evaluate between</param>
-        <summary>Constructs and returns a PropertyValuesHolder object with the specified property name or
-            setter name for use in a multi-int setter function using ObjectAnimator.</summary>
-        <returns>A PropertyValuesHolder for a multi-int parameter setter.</returns>
+        <param name="propertyName">The property being animated or complete name of the setter.
+                                Should not be null.</param>
+        <param name="converter">Used to convert the animated value to setter parameters.</param>
+        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
+            provide the necessary interpolation between the Object values to derive the animated
+            value.</param>
+        <param name="values">The values that the property will animate between.</param>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property and
+            set of Object values for use with ObjectAnimator multi-value setters.</summary>
+        <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiInt(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20android.animation.Keyframe)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiInt(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, android.animation.Keyframe)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofMultiInt(java.lang.String,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofMultiInt(java.lang.String, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -906,7 +893,6 @@
       </Parameters>
       <Docs>
         <param name="property">The property being animated. Should not be null.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
         <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
             provide the necessary interpolation between the Object values to derive the animated
             value.</param>
@@ -917,7 +903,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(android.util.Property,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(android.util.Property, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -957,20 +943,17 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
         <param name="property">The property being animated. Should not be null.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
-        <param name="values">The values that the property will animate between.</param>
+        <param name="converter">Converts a PointF to the type associated with the setter. May be
+                             null if conversion is unnecessary.</param>
+        <param name="path">The Path along which the values should be animated.</param>
         <summary>Constructs and returns a PropertyValuesHolder with a given property and
-            set of Object values.</summary>
+            a Path along which the values should be animated.</summary>
         <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(android.util.Property,%20android.animation.TypeConverter,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(android.util.Property, android.animation.TypeConverter, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -1014,8 +997,6 @@
       </Parameters>
       <Docs>
         <param name="propertyName">To be added.</param>
-        <param name="property">The property being animated. Should not be null.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
         <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
             provide the necessary interpolation between the Object values to derive the animated
             value.</param>
@@ -1062,21 +1043,17 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="property">The property being animated. Should not be null.</param>
-        <param name="converter">Converts the animated object to the Property type.</param>
-        <param name="evaluator">A TypeEvaluator that will be called on each animation frame to
-            provide the necessary interpolation between the Object values to derive the animated
-            value.</param>
-        <param name="values">The values that the property will animate between.</param>
-        <summary>Constructs and returns a PropertyValuesHolder with a given property and
-            set of Object values.</summary>
+        <param name="propertyName">The name of the property being animated.</param>
+        <param name="converter">Converts a PointF to the type associated with the setter. May be
+                             null if conversion is unnecessary.</param>
+        <param name="path">The Path along which the values should be animated.</param>
+        <summary>Constructs and returns a PropertyValuesHolder with a given property name and
+            a Path along which the values should be animated.</summary>
         <returns>PropertyValuesHolder The constructed PropertyValuesHolder object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(java.lang.String,%20android.animation.TypeConverter,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(java.lang.String, android.animation.TypeConverter, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -1136,7 +1113,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#ofObject(android.util.Property,%20android.animation.TypeConverter,%20android.animation.TypeEvaluator,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.ofObject(android.util.Property, android.animation.TypeConverter, android.animation.TypeEvaluator, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1302,7 +1279,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#setFloatValues(float)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.setFloatValues(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#setFloatValues(float[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.setFloatValues(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1348,7 +1325,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#setIntValues(int)" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.setIntValues(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/PropertyValuesHolder#setIntValues(int[])" title="Reference documentation">Java documentation for <code>android.animation.PropertyValuesHolder.setIntValues(int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml b/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml
index 57c65e8730..d5321416ef 100644
--- a/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml
+++ b/docs/Mono.Android/en/Android.Animation/RectEvaluator.xml
@@ -100,12 +100,13 @@
         <Parameter Name="reuseRect" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="reuseRect">To be added.</param>
-        <summary>Construct a RectEvaluator that returns a new Rect on every evaluate call.</summary>
+        <param name="reuseRect">A Rect to be modified and returned by evaluate.</param>
+        <summary>Constructs a RectEvaluator that modifies and returns &lt;code&gt;reuseRect&lt;/code&gt;
+            in <c>#evaluate(float, android.graphics.Rect, android.graphics.Rect)</c> calls.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/RectEvaluator#RectEvaluator()" title="Reference documentation">Java documentation for <code>android.animation.RectEvaluator.RectEvaluator()</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/RectEvaluator#RectEvaluator(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.animation.RectEvaluator.RectEvaluator(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml b/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml
index c2afce6dce..f2391cfc0c 100644
--- a/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml
+++ b/docs/Mono.Android/en/Android.Animation/ValueAnimator.xml
@@ -405,16 +405,13 @@
       </Parameters>
       <Docs>
         <param name="propertyName">To be added.</param>
-        <summary>The most recent value calculated by this &lt;code&gt;ValueAnimator&lt;/code&gt; when there is just one
-            property being animated.</summary>
-        <returns>animatedValue The value most recently calculated by this &lt;code&gt;ValueAnimator&lt;/code&gt; for
-            the single property being animated. If there are several properties being animated
-            (specified by several PropertyValuesHolder objects in the constructor), this function
-            returns the animated value for the first of those objects.</returns>
+        <summary>The most recent value calculated by this &lt;code&gt;ValueAnimator&lt;/code&gt; for &lt;code&gt;propertyName&lt;/code&gt;.</summary>
+        <returns>animatedValue The value most recently calculated for the named property
+            by this &lt;code&gt;ValueAnimator&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#getAnimatedValue()" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.getAnimatedValue()</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#getAnimatedValue(java.lang.String)" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.getAnimatedValue(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -599,7 +596,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#ofArgb(int)" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.ofArgb(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#ofArgb(int[])" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.ofArgb(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -646,7 +643,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#ofFloat(float)" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.ofFloat(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#ofFloat(float[])" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.ofFloat(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -693,7 +690,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#ofInt(int)" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.ofInt(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#ofInt(int[])" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.ofInt(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1208,7 +1205,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#setFloatValues(float)" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.setFloatValues(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#setFloatValues(float[])" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.setFloatValues(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1295,7 +1292,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#setIntValues(int)" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.setIntValues(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/animation/ValueAnimator#setIntValues(int[])" title="Reference documentation">Java documentation for <code>android.animation.ValueAnimator.setIntValues(int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo.xml b/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo.xml
index 3ebe73cd0b..1544419091 100644
--- a/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/DeviceAdminInfo.xml
@@ -69,11 +69,21 @@
         <Parameter Name="resolveInfo" Type="Android.Content.PM.ResolveInfo" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="resolveInfo">To be added.</param>
+        <param name="context">The Context in which we are parsing the device admin.</param>
+        <param name="resolveInfo">The ResolveInfo returned from the package manager about
+            this device admin's component.</param>
         <summary>Constructor.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo#DeviceAdminInfo(android.content.Context,%20android.content.pm.ResolveInfo)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminInfo.DeviceAdminInfo(android.content.Context, android.content.pm.ResolveInfo)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 8" />
         <exception cref="T:Org.XmlPull.V1.XmlPullParserException" />
diff --git a/docs/Mono.Android/en/Android.App.Admin/DeviceAdminReceiver.xml b/docs/Mono.Android/en/Android.App.Admin/DeviceAdminReceiver.xml
index a2d6af5a91..2e7e2a8678 100644
--- a/docs/Mono.Android/en/Android.App.Admin/DeviceAdminReceiver.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/DeviceAdminReceiver.xml
@@ -1540,15 +1540,17 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="user">To be added.</param>
         <param name="context">The running context as per <c>#onReceive</c>.</param>
         <param name="intent">The received intent as per <c>#onReceive</c>.</param>
+        <param name="user">The user or profile for whom the password changed. To see whether this
+                   user is the current profile or a parent user, check for equality with
+                   <c>Process#myUserHandle</c>.</param>
         <summary>Called after the user has changed their device or profile challenge password, as a result of
             receiving <c>#ACTION_PASSWORD_CHANGED</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordChanged(android.content.Context,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordChanged(android.content.Context, android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordChanged(android.content.Context,%20android.content.Intent,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordChanged(android.content.Context, android.content.Intent, android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1631,15 +1633,17 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="user">To be added.</param>
         <param name="context">The running context as per <c>#onReceive</c>.</param>
         <param name="intent">The received intent as per <c>#onReceive</c>.</param>
+        <param name="user">The user or profile for whom the password is expiring. To see whether this
+                   user is the current profile or a parent user, check for equality with
+                   <c>Process#myUserHandle</c>.</param>
         <summary>Called periodically when the device or profile challenge password is about to expire
             or has expired.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordExpiring(android.content.Context,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordExpiring(android.content.Context, android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordExpiring(android.content.Context,%20android.content.Intent,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordExpiring(android.content.Context, android.content.Intent, android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1722,15 +1726,17 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="user">To be added.</param>
         <param name="context">The running context as per <c>#onReceive</c>.</param>
         <param name="intent">The received intent as per <c>#onReceive</c>.</param>
+        <param name="user">The user or profile for whom the password check failed. To see whether this
+                   user is the current profile or a parent user, check for equality with
+                   <c>Process#myUserHandle</c>.</param>
         <summary>Called after the user has failed at entering their device or profile challenge password,
             as a result of receiving <c>#ACTION_PASSWORD_FAILED</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordFailed(android.content.Context,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordFailed(android.content.Context, android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordFailed(android.content.Context,%20android.content.Intent,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordFailed(android.content.Context, android.content.Intent, android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1813,15 +1819,17 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="user">To be added.</param>
         <param name="context">The running context as per <c>#onReceive</c>.</param>
         <param name="intent">The received intent as per <c>#onReceive</c>.</param>
+        <param name="user">The user of profile for whom the password check succeeded.  To see whether this
+                   user is the current profile or a parent user, check for equality with
+                   <c>Process#myUserHandle</c>.</param>
         <summary>Called after the user has succeeded at entering their device or profile challenge password,
             as a result of receiving <c>#ACTION_PASSWORD_SUCCEEDED</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordSucceeded(android.content.Context,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordSucceeded(android.content.Context, android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DeviceAdminReceiver#onPasswordSucceeded(android.content.Context,%20android.content.Intent,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.app.admin.DeviceAdminReceiver.onPasswordSucceeded(android.content.Context, android.content.Intent, android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml b/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml
index 96008187c3..8cbd4c8009 100644
--- a/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml
+++ b/docs/Mono.Android/en/Android.App.Admin/DevicePolicyManager.xml
@@ -2161,18 +2161,15 @@
         <Parameter Name="packageName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="packageName">The package to be re-enabled in the current profile.
-</param>
         <param name="admin">Which <c>DeviceAdminReceiver</c> this request is associated with, or
                        <c>null</c> if the caller is an enable system app delegate.</param>
-        <param name="intent">An intent matching the app(s) to be installed. All apps that resolve for this
-                       intent will be re-enabled in the calling profile.</param>
-        <summary>Re-enable system apps by intent that were disabled by default when the user was initialized.</summary>
+        <param name="packageName">The package to be re-enabled in the calling profile.</param>
+        <summary>Re-enable a system app that was disabled by default when the user was initialized.</summary>
         <returns>int The number of activities that matched the intent and were installed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#enableSystemApp(android.content.ComponentName,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.enableSystemApp(android.content.ComponentName, android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#enableSystemApp(android.content.ComponentName,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.enableSystemApp(android.content.ComponentName, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -4326,10 +4323,21 @@
       </Parameters>
       <Docs>
         <param name="admin">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <summary>Called by a device or profile owner to read the name of the package administering an
+            always-on VPN connection for the current user.</summary>
+        <returns>Package name of VPN controller responsible for always-on VPN, or <c>null</c> if none
+                    is set.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#getAlwaysOnVpnPackage(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.getAlwaysOnVpnPackage(android.content.ComponentName)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -4700,10 +4708,23 @@
         <Parameter Name="admin" Type="Android.Content.ComponentName" />
       </Parameters>
       <Docs>
-        <param name="admin">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="admin">which <c>DeviceAdminReceiver</c> this request is associated with</param>
+        <summary>Gets a set of package names that are allowed to access cross-profile calendar APIs.</summary>
+        <returns>the set of names of packages that were previously allowed via
+            <c>#setCrossProfileCalendarPackages(ComponentName, Set)</c>, or an
+            empty set if none have been allowed</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#getCrossProfileCalendarPackages(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.getCrossProfileCalendarPackages(android.content.ComponentName)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="GetCrossProfileCallerIdDisabled">
@@ -6604,11 +6625,20 @@
         <Parameter Name="admin" Type="Android.Content.ComponentName" />
       </Parameters>
       <Docs>
-        <param name="admin">Which <see cref="T:Android.App.Admin.DeviceAdminReceiver" /> this request is associated with.</param>
+        <param name="admin">Which <c>DeviceAdminReceiver</c> this request is associated with.</param>
         <summary>Returns the list of permitted accessibility services set by this device or profile owner.</summary>
-        <returns>To be added.</returns>
+        <returns>List of accessiblity service package names.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#getPermittedAccessibilityServices(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.getPermittedAccessibilityServices(android.content.ComponentName)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -7875,30 +7905,33 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="certs">To be added.</param>
-        <param name="flags">To be added.</param>
         <param name="admin">Which <c>DeviceAdminReceiver</c> this request is associated with, or
-                       <c>null</c> if calling from a delegated certificate installer.</param>
+                   <c>null</c> if calling from a delegated certificate installer.</param>
         <param name="privKey">The private key to install.</param>
-        <param name="cert">The certificate to install.</param>
+        <param name="certs">The certificate chain to install. The chain should start with the leaf
+                   certificate and include the chain of trust in order. This will be returned by
+                   <c>android.security.KeyChain#getCertificateChain</c>.</param>
         <param name="alias">The private key alias under which to install the certificate. If a certificate
-            with that alias already exists, it will be overwritten.</param>
-        <summary>This API can be called by the following to install a certificate and corresponding
-            private key:
+                   with that alias already exists, it will be overwritten.</param>
+        <param name="flags">Flags to request that the calling app be granted access to the credentials
+                   and set the key to be user-selectable. See <c>#INSTALLKEY_SET_USER_SELECTABLE</c> and
+                   <c>#INSTALLKEY_REQUEST_CREDENTIALS_ACCESS</c>.</param>
+        <summary>This API can be called by the following to install a certificate chain and corresponding
+            private key for the leaf certificate:
             &lt;ul&gt;
                &lt;li&gt;Device owner&lt;/li&gt;
                &lt;li&gt;Profile owner&lt;/li&gt;
                &lt;li&gt;Delegated certificate installer&lt;/li&gt;
                &lt;li&gt;Credential management app&lt;/li&gt;
             &lt;/ul&gt;
-            All apps within the profile will be able to access the certificate and use the private key,
-            given direct user approval.</summary>
+            All apps within the profile will be able to access the certificate chain and use the
+            private key, given direct user approval (if the user is allowed to select the private key).</summary>
         <returns>
           <c>true</c> if the keys were installed, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#installKeyPair(android.content.ComponentName,%20java.security.PrivateKey,%20java.security.cert.Certificate,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#installKeyPair(android.content.ComponentName,%20java.security.PrivateKey,%20java.security.cert.Certificate[],%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate[], java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -7936,30 +7969,34 @@
         <Parameter Name="requestAccess" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="certs">To be added.</param>
-        <param name="requestAccess">To be added.</param>
         <param name="admin">Which <c>DeviceAdminReceiver</c> this request is associated with, or
-                       <c>null</c> if calling from a delegated certificate installer.</param>
+                   <c>null</c> if calling from a delegated certificate installer.</param>
         <param name="privKey">The private key to install.</param>
-        <param name="cert">The certificate to install.</param>
+        <param name="certs">The certificate chain to install. The chain should start with the leaf
+                   certificate and include the chain of trust in order. This will be returned by
+                   <c>android.security.KeyChain#getCertificateChain</c>.</param>
         <param name="alias">The private key alias under which to install the certificate. If a certificate
-            with that alias already exists, it will be overwritten.</param>
-        <summary>This API can be called by the following to install a certificate and corresponding
-            private key:
+                   with that alias already exists, it will be overwritten.</param>
+        <param name="requestAccess">
+          <c>true</c> to request that the calling app be granted access to the
+                   credentials immediately. Otherwise, access to the credentials will be gated by user
+                   approval.</param>
+        <summary>This API can be called by the following to install a certificate chain and corresponding
+            private key for the leaf certificate:
             &lt;ul&gt;
                &lt;li&gt;Device owner&lt;/li&gt;
                &lt;li&gt;Profile owner&lt;/li&gt;
                &lt;li&gt;Delegated certificate installer&lt;/li&gt;
                &lt;li&gt;Credential management app&lt;/li&gt;
             &lt;/ul&gt;
-            All apps within the profile will be able to access the certificate and use the private key,
-            given direct user approval.</summary>
+            All apps within the profile will be able to access the certificate chain and use the private
+            key, given direct user approval.</summary>
         <returns>
           <c>true</c> if the keys were installed, <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#installKeyPair(android.content.ComponentName,%20java.security.PrivateKey,%20java.security.cert.Certificate,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#installKeyPair(android.content.ComponentName,%20java.security.PrivateKey,%20java.security.cert.Certificate[],%20java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate[], java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -8279,10 +8316,22 @@
         <Parameter Name="admin" Type="Android.Content.ComponentName" />
       </Parameters>
       <Docs>
-        <param name="admin">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="admin">Which <c>DeviceAdminReceiver</c> this request is associated with.</param>
+        <summary>Called by device or profile owner to query whether current always-on VPN is configured in
+            lockdown mode.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#isAlwaysOnVpnLockdownEnabled(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.isAlwaysOnVpnLockdownEnabled(android.content.ComponentName)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="IsApplicationHidden">
@@ -9981,13 +10030,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
+        <param name="flags">May be 0 or <c>#FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY</c>.</param>
         <summary>Make the device lock immediately, as if the lock screen timeout has expired at the point of
             this call.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#lockNow()" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.lockNow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#lockNow(int)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.lockNow(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -12461,18 +12510,20 @@
       </Parameters>
       <Docs>
         <param name="admin">To be added.</param>
-        <param name="lockdownAllowlist">To be added.</param>
-        <param name="vpnPackage">The package name for an installed VPN app on the device, or <c>null</c> to
-                   remove an existing always-on VPN configuration.</param>
+        <param name="vpnPackage">package name for an installed VPN app on the device, or <c>null</c>
+                    to remove an existing always-on VPN configuration</param>
         <param name="lockdownEnabled">
           <c>true</c> to disallow networking when the VPN is not connected or
-                   <c>false</c> otherwise. This has no effect when clearing.</param>
-        <summary>Called by a device or profile owner to configure an always-on VPN connection through a
-            specific application for the current user.</summary>
+                    <c>false</c> otherwise. This has no effect when clearing.</param>
+        <param name="lockdownAllowlist">Packages that will be able to access the network directly when VPN
+                    is in lockdown mode but not connected. Has no effect when clearing.</param>
+        <summary>A version of <c>#setAlwaysOnVpnPackage(ComponentName, String, boolean)</c> that allows the
+            admin to specify a set of apps that should be able to access the network directly when VPN
+            is not connected.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#setAlwaysOnVpnPackage(android.content.ComponentName,%20java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#setAlwaysOnVpnPackage(android.content.ComponentName,%20java.lang.String,%20boolean,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String, boolean, java.util.Set)</code>.</a>
             </format>
           </para>
           <para>
@@ -17000,15 +17051,16 @@
         <Parameter Name="reason" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
         <param name="flags">Bit mask of additional options: currently supported flags are
-                       <c>#WIPE_EXTERNAL_STORAGE</c>, <c>#WIPE_RESET_PROTECTION_DATA</c>,
-                       <c>#WIPE_EUICC</c> and <c>#WIPE_SILENTLY</c>.</param>
+                       <c>#WIPE_EXTERNAL_STORAGE</c>, <c>#WIPE_RESET_PROTECTION_DATA</c> and
+                       <c>#WIPE_EUICC</c>.</param>
+        <param name="reason">a string that contains the reason for wiping data, which can be
+                       presented to the user.</param>
         <summary>Ask that all user data be wiped.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#wipeData(int)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.wipeData(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#wipeData(int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.wipeData(int, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -17044,15 +17096,16 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
         <param name="flags">Bit mask of additional options: currently supported flags are
-                       <c>#WIPE_EXTERNAL_STORAGE</c>, <c>#WIPE_RESET_PROTECTION_DATA</c>,
-                       <c>#WIPE_EUICC</c> and <c>#WIPE_SILENTLY</c>.</param>
+                       <c>#WIPE_EXTERNAL_STORAGE</c>, <c>#WIPE_RESET_PROTECTION_DATA</c> and
+                       <c>#WIPE_EUICC</c>.</param>
+        <param name="reason">a string that contains the reason for wiping data, which can be
+                       presented to the user.</param>
         <summary>Ask that all user data be wiped.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#wipeData(int)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.wipeData(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager#wipeData(int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.admin.DevicePolicyManager.wipeData(int, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.AppSearch.Exceptions/AppSearchException.xml b/docs/Mono.Android/en/Android.App.AppSearch.Exceptions/AppSearchException.xml
index e7a384f2a9..9d9542b5f1 100644
--- a/docs/Mono.Android/en/Android.App.AppSearch.Exceptions/AppSearchException.xml
+++ b/docs/Mono.Android/en/Android.App.AppSearch.Exceptions/AppSearchException.xml
@@ -104,13 +104,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
         <param name="resultCode">One of the constants documented in <c>AppSearchResult#getResultCode</c>.</param>
-        <summary>Initializes an <c>AppSearchException</c> with no message.</summary>
+        <param name="message">The detail message (which is saved for later retrieval by the <c>#getMessage()</c> method).</param>
+        <summary>Initializes an <c>AppSearchException</c> with a result code and message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/appsearch/exceptions/AppSearchException#AppSearchException(int)" title="Reference documentation">Java documentation for <code>android.app.appsearch.exceptions.AppSearchException.AppSearchException(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/appsearch/exceptions/AppSearchException#AppSearchException(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.appsearch.exceptions.AppSearchException.AppSearchException(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -171,14 +171,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
         <param name="resultCode">One of the constants documented in <c>AppSearchResult#getResultCode</c>.</param>
-        <summary>Initializes an <c>AppSearchException</c> with no message.</summary>
+        <param name="message">The detail message (which is saved for later retrieval by the <c>#getMessage()</c> method).</param>
+        <param name="cause">The cause (which is saved for later retrieval by the <c>#getCause()</c>
+                method). (A null value is permitted, and indicates that the cause is nonexistent or
+                unknown.)</param>
+        <summary>Initializes an <c>AppSearchException</c> with a result code, message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/appsearch/exceptions/AppSearchException#AppSearchException(int)" title="Reference documentation">Java documentation for <code>android.app.appsearch.exceptions.AppSearchException.AppSearchException(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/appsearch/exceptions/AppSearchException#AppSearchException(int,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.app.appsearch.exceptions.AppSearchException.AppSearchException(int, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.AppSearch/AppSearchSession.xml b/docs/Mono.Android/en/Android.App.AppSearch/AppSearchSession.xml
index f175e9d345..c63cbaa1e0 100644
--- a/docs/Mono.Android/en/Android.App.AppSearch/AppSearchSession.xml
+++ b/docs/Mono.Android/en/Android.App.AppSearch/AppSearchSession.xml
@@ -418,25 +418,19 @@
         <Parameter Name="callback" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="queryExpression">To be added.</param>
-        <param name="searchSpec">To be added.</param>
-        <param name="request">
-          <c>RemoveByDocumentIdRequest</c> with IDs in a namespace to remove from the
-                index.</param>
+        <param name="queryExpression">Query String to search.</param>
+        <param name="searchSpec">Spec containing schemaTypes, namespaces and query expression indicates how
+                document will be removed. All specific about how to scoring, ordering, snippeting and
+                resulting will be ignored.</param>
         <param name="executor">Executor on which to invoke the callback.</param>
-        <param name="callback">Callback to receive the pending result of performing this operation. The keys
-                            of the returned <c>AppSearchBatchResult</c> are the input document IDs. The
-                            values are <c>null</c> on success, or a failed <c>AppSearchResult</c>
-                            otherwise. IDs that are not found will return a failed
-                            <c>AppSearchResult</c> with a result code of
-                            <c>AppSearchResult#RESULT_NOT_FOUND</c>. If an unexpected internal error
-                            occurs in the AppSearch service, <c>BatchResultCallback#onSystemError</c>
-                            will be invoked with a <c>Throwable</c>.</param>
-        <summary>Removes <c>GenericDocument</c> objects by document IDs in a namespace from the <c>AppSearchSession</c> database.</summary>
+        <param name="callback">Callback to receive errors resulting from removing the documents. If
+                                   the operation succeeds, the callback will be invoked with
+                                   <c>null</c>.</param>
+        <summary>Removes <c>GenericDocument</c>s from the index by Query.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/appsearch/AppSearchSession#remove(android.app.appsearch.RemoveByDocumentIdRequest,%20java.util.concurrent.Executor,%20android.app.appsearch.BatchResultCallback)" title="Reference documentation">Java documentation for <code>android.app.appsearch.AppSearchSession.remove(android.app.appsearch.RemoveByDocumentIdRequest, java.util.concurrent.Executor, android.app.appsearch.BatchResultCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/appsearch/AppSearchSession#remove(java.lang.String,%20android.app.appsearch.SearchSpec,%20java.util.concurrent.Executor,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.app.appsearch.AppSearchSession.remove(java.lang.String, android.app.appsearch.SearchSpec, java.util.concurrent.Executor, java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.AppSearch/PackageIdentifier.xml b/docs/Mono.Android/en/Android.App.AppSearch/PackageIdentifier.xml
index 185f82698f..6cc2b374ba 100644
--- a/docs/Mono.Android/en/Android.App.AppSearch/PackageIdentifier.xml
+++ b/docs/Mono.Android/en/Android.App.AppSearch/PackageIdentifier.xml
@@ -75,10 +75,21 @@
         <Parameter Name="sha256Certificate" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="sha256Certificate">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="packageName">Name of the package.</param>
+        <param name="sha256Certificate">SHA256 certificate digest of the package.</param>
+        <summary>Creates a unique identifier for a package.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/appsearch/PackageIdentifier#PackageIdentifier(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>android.app.appsearch.PackageIdentifier.PackageIdentifier(java.lang.String, byte[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="GetSha256Certificate">
diff --git a/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml b/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml
index f312dbbfd0..8800a3a12b 100644
--- a/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml
+++ b/docs/Mono.Android/en/Android.App.Backup/BackupAgent.xml
@@ -586,12 +586,12 @@
                        empty file. The application should record the final backup
                        state here after restoring its data from the &lt;code&gt;data&lt;/code&gt; stream.
                        When a full-backup dataset is being restored, this will be &lt;code&gt;null&lt;/code&gt;.</param>
-        <summary>The application is being restored from backup and should replace any
-            existing data with the contents of the backup.</summary>
+        <summary>New version of <c>#onRestore(BackupDataInput, int, android.os.ParcelFileDescriptor)</c>
+            that handles a long app version code.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/backup/BackupAgent#onRestore(android.app.backup.BackupDataInput,%20int,%20android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.app.backup.BackupAgent.onRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/backup/BackupAgent#onRestore(android.app.backup.BackupDataInput,%20long,%20android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.app.backup.BackupAgent.onRestore(android.app.backup.BackupDataInput, long, android.os.ParcelFileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.Backup/BackupManager.xml b/docs/Mono.Android/en/Android.App.Backup/BackupManager.xml
index 169be9b0be..4e39fed49e 100644
--- a/docs/Mono.Android/en/Android.App.Backup/BackupManager.xml
+++ b/docs/Mono.Android/en/Android.App.Backup/BackupManager.xml
@@ -159,14 +159,13 @@
         <Parameter Name="packageName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="packageName">The package name identifying the application to back up.
-</param>
-        <summary>Notifies the Android backup system that your application wishes to back up
-            new changes to its data.</summary>
+        <param name="packageName">The package name identifying the application to back up.</param>
+        <summary>Convenience method for callers who need to indicate that some other package
+            needs a backup pass.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/backup/BackupManager#dataChanged()" title="Reference documentation">Java documentation for <code>android.app.backup.BackupManager.dataChanged()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/backup/BackupManager#dataChanged(java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.backup.BackupManager.dataChanged(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.Blob/BlobStoreManager.xml b/docs/Mono.Android/en/Android.App.Blob/BlobStoreManager.xml
index 3cf0cb5068..abf0b5d5e1 100644
--- a/docs/Mono.Android/en/Android.App.Blob/BlobStoreManager.xml
+++ b/docs/Mono.Android/en/Android.App.Blob/BlobStoreManager.xml
@@ -107,16 +107,17 @@
         <Parameter Name="description" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="description">To be added.</param>
         <param name="blobHandle">the <c>BlobHandle</c> representing the blob that the caller wants to
                               acquire a lease for.</param>
-        <param name="descriptionResId">the resource id for a short description string that can be surfaced
-                                    to the user explaining what the blob is used for.</param>
+        <param name="description">a short description string that can be surfaced
+                               to the user explaining what the blob is used for. It is recommended to
+                               keep this description brief. This may be truncated and
+                               ellipsized if it is too long to be displayed to the user.</param>
         <summary>Acquire a lease to the blob represented by <c>blobHandle</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20int)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,16 +189,17 @@
         <Parameter Name="description" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="description">To be added.</param>
         <param name="blobHandle">the <c>BlobHandle</c> representing the blob that the caller wants to
                               acquire a lease for.</param>
-        <param name="descriptionResId">the resource id for a short description string that can be surfaced
-                                    to the user explaining what the blob is used for.</param>
+        <param name="description">a short description string that can be surfaced
+                               to the user explaining what the blob is used for. It is recommended to
+                               keep this description brief. This may be truncated and
+                               ellipsized if it is too long to be displayed to the user.</param>
         <summary>Acquire a lease to the blob represented by <c>blobHandle</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20int)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -233,17 +235,24 @@
         <Parameter Name="leaseExpiryTimeMillis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="description">To be added.</param>
-        <param name="leaseExpiryTimeMillis">To be added.</param>
         <param name="blobHandle">the <c>BlobHandle</c> representing the blob that the caller wants to
                               acquire a lease for.</param>
-        <param name="descriptionResId">the resource id for a short description string that can be surfaced
-                                    to the user explaining what the blob is used for.</param>
+        <param name="description">a short description string that can be surfaced
+                               to the user explaining what the blob is used for. It is recommended to
+                               keep this description brief. This may be truncated and ellipsized
+                               if it is too long to be displayed to the user.</param>
+        <param name="leaseExpiryTimeMillis">the time in milliseconds after which the lease can be
+                                         automatically released, in <c>System#currentTimeMillis()</c>
+                                         timebase. If its value is <c>0</c>, then the behavior of this
+                                         API is identical to <c>#acquireLease(BlobHandle, int)</c>
+                                         where clients have to explicitly call
+                                         <c>#releaseLease(BlobHandle)</c> when they don't
+                                         need the blob anymore.</param>
         <summary>Acquire a lease to the blob represented by <c>blobHandle</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20int)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20java.lang.CharSequence,%20long)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, java.lang.CharSequence, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -279,16 +288,22 @@
         <Parameter Name="leaseExpiryTimeMillis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="leaseExpiryTimeMillis">To be added.</param>
         <param name="blobHandle">the <c>BlobHandle</c> representing the blob that the caller wants to
                               acquire a lease for.</param>
         <param name="descriptionResId">the resource id for a short description string that can be surfaced
                                     to the user explaining what the blob is used for.</param>
+        <param name="leaseExpiryTimeMillis">the time in milliseconds after which the lease can be
+                                         automatically released, in <c>System#currentTimeMillis()</c>
+                                         timebase. If its value is <c>0</c>, then the behavior of this
+                                         API is identical to <c>#acquireLease(BlobHandle, int)</c>
+                                         where clients have to explicitly call
+                                         <c>#releaseLease(BlobHandle)</c> when they don't
+                                         need the blob anymore.</param>
         <summary>Acquire a lease to the blob represented by <c>blobHandle</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20int)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -318,17 +333,24 @@
         <Parameter Name="leaseExpiryTimeMillis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="description">To be added.</param>
-        <param name="leaseExpiryTimeMillis">To be added.</param>
         <param name="blobHandle">the <c>BlobHandle</c> representing the blob that the caller wants to
                               acquire a lease for.</param>
-        <param name="descriptionResId">the resource id for a short description string that can be surfaced
-                                    to the user explaining what the blob is used for.</param>
+        <param name="description">a short description string that can be surfaced
+                               to the user explaining what the blob is used for. It is recommended to
+                               keep this description brief. This may be truncated and ellipsized
+                               if it is too long to be displayed to the user.</param>
+        <param name="leaseExpiryTimeMillis">the time in milliseconds after which the lease can be
+                                         automatically released, in <c>System#currentTimeMillis()</c>
+                                         timebase. If its value is <c>0</c>, then the behavior of this
+                                         API is identical to <c>#acquireLease(BlobHandle, int)</c>
+                                         where clients have to explicitly call
+                                         <c>#releaseLease(BlobHandle)</c> when they don't
+                                         need the blob anymore.</param>
         <summary>Acquire a lease to the blob represented by <c>blobHandle</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20int)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/blob/BlobStoreManager#acquireLease(android.app.blob.BlobHandle,%20java.lang.CharSequence,%20long)" title="Reference documentation">Java documentation for <code>android.app.blob.BlobStoreManager.acquireLease(android.app.blob.BlobHandle, java.lang.CharSequence, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.Job/JobWorkItem.xml b/docs/Mono.Android/en/Android.App.Job/JobWorkItem.xml
index 7bfba0afbe..cdfa99c0a8 100644
--- a/docs/Mono.Android/en/Android.App.Job/JobWorkItem.xml
+++ b/docs/Mono.Android/en/Android.App.Job/JobWorkItem.xml
@@ -106,15 +106,17 @@
         <Parameter Name="uploadBytes" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="downloadBytes">To be added.</param>
-        <param name="uploadBytes">To be added.</param>
         <param name="intent">The general Intent describing this work.</param>
+        <param name="downloadBytes">The estimated size of network traffic that will be
+                       downloaded by this job work item, in bytes.</param>
+        <param name="uploadBytes">The estimated size of network traffic that will be
+                       uploaded by this job work item, in bytes.</param>
         <summary>Create a new piece of work, which can be submitted to
             <c>JobScheduler#enqueue JobScheduler.enqueue</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/job/JobWorkItem#JobWorkItem(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.job.JobWorkItem.JobWorkItem(android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/job/JobWorkItem#JobWorkItem(android.content.Intent,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.app.job.JobWorkItem.JobWorkItem(android.content.Intent, long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App.Slices/SliceManager.xml b/docs/Mono.Android/en/Android.App.Slices/SliceManager.xml
index ac0c794f17..f402933a87 100644
--- a/docs/Mono.Android/en/Android.App.Slices/SliceManager.xml
+++ b/docs/Mono.Android/en/Android.App.Slices/SliceManager.xml
@@ -78,11 +78,22 @@
         <Parameter Name="supportedSpecs" Type="System.Collections.Generic.ICollection&lt;Android.App.Slices.SliceSpec&gt;" />
       </Parameters>
       <Docs>
-        <param name="intent">To be added.</param>
-        <param name="supportedSpecs">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="intent">The intent associated with a slice.</param>
+        <param name="supportedSpecs">List of supported specs.</param>
+        <summary>Turns a slice intent into slice content.</summary>
+        <returns>The Slice provided by the app or null if none is given.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/slice/SliceManager#bindSlice(android.content.Intent,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.app.slice.SliceManager.bindSlice(android.content.Intent, java.util.Set)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="BindSlice">
@@ -109,11 +120,22 @@
         <Parameter Name="supportedSpecs" Type="System.Collections.Generic.ICollection&lt;Android.App.Slices.SliceSpec&gt;" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="supportedSpecs">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="uri">The URI to a slice provider</param>
+        <param name="supportedSpecs">List of supported specs.</param>
+        <summary>Turns a slice Uri into slice content.</summary>
+        <returns>The Slice provided by the app or null if none is given.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/slice/SliceManager#bindSlice(android.net.Uri,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.app.slice.SliceManager.bindSlice(android.net.Uri, java.util.Set)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="CategorySlice">
@@ -456,10 +478,21 @@
         <Parameter Name="specs" Type="System.Collections.Generic.ICollection&lt;Android.App.Slices.SliceSpec&gt;" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="specs">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="uri">The uri of the slice being pinned.</param>
+        <param name="specs">The list of supported <c>SliceSpec</c>s of the callback.</param>
+        <summary>Ensures that a slice is in a pinned state.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/slice/SliceManager#pinSlice(android.net.Uri,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.app.slice.SliceManager.pinSlice(android.net.Uri, java.util.Set)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="RevokeSlicePermission">
diff --git a/docs/Mono.Android/en/Android.App.Slices/SliceProvider.xml b/docs/Mono.Android/en/Android.App.Slices/SliceProvider.xml
index 13e294d6da..8820046131 100644
--- a/docs/Mono.Android/en/Android.App.Slices/SliceProvider.xml
+++ b/docs/Mono.Android/en/Android.App.Slices/SliceProvider.xml
@@ -50,8 +50,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="autoGrantPermissions">List of permissions that holders are auto-granted access
-                                        to slices.</param>
         <summary>A version of constructing a SliceProvider that allows autogranting slice permissions
             to apps that hold specific platform permissions.</summary>
         <remarks>
@@ -280,11 +278,22 @@
         <Parameter Name="supportedSpecs" Type="System.Collections.Generic.ICollection&lt;Android.App.Slices.SliceSpec&gt;" />
       </Parameters>
       <Docs>
-        <param name="sliceUri">To be added.</param>
-        <param name="supportedSpecs">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="sliceUri">Uri to bind.</param>
+        <param name="supportedSpecs">List of supported specs.</param>
+        <summary>Implemented to create a slice.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/slice/SliceProvider#onBindSlice(android.net.Uri,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.app.slice.SliceProvider.onBindSlice(android.net.Uri, java.util.Set)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="OnCreatePermissionRequest">
diff --git a/docs/Mono.Android/en/Android.App.Usage/StorageStatsManager.xml b/docs/Mono.Android/en/Android.App.Usage/StorageStatsManager.xml
index 1cf257514f..5cba0da856 100644
--- a/docs/Mono.Android/en/Android.App.Usage/StorageStatsManager.xml
+++ b/docs/Mono.Android/en/Android.App.Usage/StorageStatsManager.xml
@@ -79,11 +79,21 @@
         <Parameter Name="storageUuid" Type="Java.Util.UUID" />
       </Parameters>
       <Docs>
-        <param name="storageUuid">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="storageUuid">the UUID of the storage volume you're interested in,
+                       such as <c>StorageManager#UUID_DEFAULT</c>.</param>
+        <summary>Return the free space on the requested storage volume.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/usage/StorageStatsManager#getFreeBytes(java.util.UUID)" title="Reference documentation">Java documentation for <code>android.app.usage.StorageStatsManager.getFreeBytes(java.util.UUID)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -110,11 +120,22 @@
         <Parameter Name="storageUuid" Type="Java.Util.UUID" />
       </Parameters>
       <Docs>
-        <param name="storageUuid">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="storageUuid">the UUID of the storage volume you're interested in,
+                       such as <c>StorageManager#UUID_DEFAULT</c>.</param>
+        <summary>Return the total size of the underlying physical media that is hosting
+            this storage volume.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/usage/StorageStatsManager#getTotalBytes(java.util.UUID)" title="Reference documentation">Java documentation for <code>android.app.usage.StorageStatsManager.getTotalBytes(java.util.UUID)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -173,12 +194,23 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="storageUuid">To be added.</param>
         <param name="user">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="storageUuid">the UUID of the storage volume you're interested in,
+                       such as <c>StorageManager#UUID_DEFAULT</c>.</param>
+        <summary>Return shared/external storage statistics for a specific
+            <c>UserHandle</c> on the requested storage volume.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/usage/StorageStatsManager#queryExternalStatsForUser(java.util.UUID,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.app.usage.StorageStatsManager.queryExternalStatsForUser(java.util.UUID, android.os.UserHandle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -207,13 +239,24 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="storageUuid">To be added.</param>
-        <param name="packageName">To be added.</param>
-        <param name="user">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="storageUuid">the UUID of the storage volume you're interested in,
+                       such as <c>StorageManager#UUID_DEFAULT</c>.</param>
+        <param name="packageName">the package name you're interested in.</param>
+        <param name="user">the user you're interested in.</param>
+        <summary>Return storage statistics for a specific package on the requested storage
+            volume.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/usage/StorageStatsManager#queryStatsForPackage(java.util.UUID,%20java.lang.String,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.app.usage.StorageStatsManager.queryStatsForPackage(java.util.UUID, java.lang.String, android.os.UserHandle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -241,12 +284,23 @@
         <Parameter Name="uid" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="storageUuid">To be added.</param>
-        <param name="uid">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="storageUuid">the UUID of the storage volume you're interested in,
+                       such as <c>StorageManager#UUID_DEFAULT</c>.</param>
+        <param name="uid">the UID you're interested in.</param>
+        <summary>Return storage statistics for a specific UID on the requested storage
+            volume.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/usage/StorageStatsManager#queryStatsForUid(java.util.UUID,%20int)" title="Reference documentation">Java documentation for <code>android.app.usage.StorageStatsManager.queryStatsForUid(java.util.UUID, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -274,12 +328,23 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="storageUuid">To be added.</param>
-        <param name="user">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="storageUuid">the UUID of the storage volume you're interested in,
+                       such as <c>StorageManager#UUID_DEFAULT</c>.</param>
+        <param name="user">the user you're interested in.</param>
+        <summary>Return storage statistics for a specific <c>UserHandle</c> on the
+            requested storage volume.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/usage/StorageStatsManager#queryStatsForUser(java.util.UUID,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.app.usage.StorageStatsManager.queryStatsForUser(java.util.UUID, android.os.UserHandle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.App/ActionBar.xml b/docs/Mono.Android/en/Android.App/ActionBar.xml
index 7677f113bc..706bdd9fdc 100644
--- a/docs/Mono.Android/en/Android.App/ActionBar.xml
+++ b/docs/Mono.Android/en/Android.App/ActionBar.xml
@@ -187,8 +187,8 @@
         <Parameter Name="setSelected" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="setSelected">True if the added tab should become the selected tab.</param>
         <param name="tab">Tab to add</param>
+        <param name="setSelected">True if the added tab should become the selected tab.</param>
         <summary>Add a tab for use in tabbed navigation mode.</summary>
         <remarks>
           <para>
@@ -229,8 +229,8 @@
         <Parameter Name="position" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="position">The new position of the tab</param>
         <param name="tab">Tab to add</param>
+        <param name="position">The new position of the tab</param>
         <summary>Add a tab for use in tabbed navigation mode.</summary>
         <remarks>
           <para>
@@ -272,9 +272,9 @@
         <Parameter Name="setSelected" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="tab">Tab to add</param>
         <param name="position">The new position of the tab</param>
         <param name="setSelected">True if the added tab should become the selected tab.</param>
-        <param name="tab">Tab to add</param>
         <summary>Add a tab for use in tabbed navigation mode.</summary>
         <remarks>
           <para>
@@ -1134,7 +1134,6 @@
       <Docs>
         <param name="view">Custom navigation view to place in the ActionBar.</param>
         <param name="layoutParams">How this custom view should layout in the bar.</param>
-        <param name="resId">Resource ID of a layout to inflate into the ActionBar.</param>
         <summary>Set the action bar into custom navigation mode, supplying a view
             for custom navigation.</summary>
         <remarks>
@@ -1234,15 +1233,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mask">A bit mask declaring which display options should be changed.
-</param>
         <param name="options">A combination of the bits defined by the DISPLAY_ constants
                            defined in ActionBar.</param>
-        <summary>Set display options.</summary>
+        <param name="mask">A bit mask declaring which display options should be changed.</param>
+        <summary>Set selected display options.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ActionBar#setDisplayOptions(int)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setDisplayOptions(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ActionBar#setDisplayOptions(int,%20int)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setDisplayOptions(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1446,13 +1444,11 @@
       </Parameters>
       <Docs>
         <param name="description">New description for the Home action when enabled</param>
-        <param name="resId">Resource ID of a string to use as the new description
-                         for the Home action when enabled</param>
         <summary>Set an alternate description for the Home/Up action, when enabled.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ActionBar#setHomeActionContentDescription(int)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setHomeActionContentDescription(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ActionBar#setHomeActionContentDescription(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setHomeActionContentDescription(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1526,14 +1522,12 @@
         <Parameter Name="description" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="description">To be added.</param>
-        <param name="resId">Resource ID of a string to use as the new description
-                         for the Home action when enabled</param>
+        <param name="description">New description for the Home action when enabled</param>
         <summary>Set an alternate description for the Home/Up action, when enabled.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ActionBar#setHomeActionContentDescription(int)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setHomeActionContentDescription(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ActionBar#setHomeActionContentDescription(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setHomeActionContentDescription(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1568,14 +1562,12 @@
       </Parameters>
       <Docs>
         <param name="indicator">A drawable to use for the up indicator, or null to use the theme's default</param>
-        <param name="resId">Resource ID of a drawable to use for the up indicator, or null
-                         to use the theme's default</param>
         <summary>Set an alternate drawable to display next to the icon/logo/title
             when <c>#DISPLAY_HOME_AS_UP</c> is enabled.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ActionBar#setHomeAsUpIndicator(int)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setHomeAsUpIndicator(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ActionBar#setHomeAsUpIndicator(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setHomeAsUpIndicator(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1699,12 +1691,11 @@
       </Parameters>
       <Docs>
         <param name="icon">Drawable to show as an icon.</param>
-        <param name="resId">Resource ID of a drawable to show as an icon.</param>
         <summary>Set the icon to display in the 'home' section of the action bar.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ActionBar#setIcon(int)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ActionBar#setIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1829,12 +1820,11 @@
       </Parameters>
       <Docs>
         <param name="logo">Drawable to show as a logo.</param>
-        <param name="resId">Resource ID of a drawable to show as a logo.</param>
         <summary>Set the logo to display in the 'home' section of the action bar.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ActionBar#setLogo(int)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setLogo(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ActionBar#setLogo(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.app.ActionBar.setLogo(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/Activity.xml b/docs/Mono.Android/en/Android.App/Activity.xml
index 8de9b72a85..3b067b67e2 100644
--- a/docs/Mono.Android/en/Android.App/Activity.xml
+++ b/docs/Mono.Android/en/Android.App/Activity.xml
@@ -2476,10 +2476,23 @@
         <param name="selection">SQL WHERE clause.</param>
         <param name="selectionArgs">The arguments to selection, if any ?s are pesent</param>
         <param name="sortOrder">SQL ORDER BY clause.</param>
-        <summary ToolPath="TrimmedButTooLong" tool="FirstSentenceInLongSummaries">To be added.</summary>
-        <returns>To be added.</returns>
+        <summary>Wrapper around
+            <c>ContentResolver#query(android.net.Uri , String[], String, String[], String)</c>
+            that gives the resulting <c>Cursor</c> to call
+            <c>#startManagingCursor</c> so that the activity will manage its
+            lifecycle for you.</summary>
+        <returns>The Cursor that was returned by query().</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/Activity#managedQuery(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.Activity.managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <altmember cref="M:Android.Content.ContentResolver.Query(Android.Net.Uri, System.String[], System.String[], System.String[], System.String[])" />
@@ -3358,18 +3371,21 @@
         <Parameter Name="persistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="persistentState">if the activity is being re-initialized after
-     previously being shut down or powered off then this Bundle contains the data it most
-     recently supplied to outPersistentState in <see cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" />.
-     <format type="text/html"><b><i>Note: Otherwise it is null.</i></b></format></param>
-        <param name="savedInstanceState">If the activity is being re-initialized after
+        <param name="savedInstanceState">if the activity is being re-initialized after
                 previously being shut down then this Bundle contains the data it most
-                recently supplied in <c>#onSaveInstanceState</c>.  &lt;b&gt;<i>Note: Otherwise it is null.</i>&lt;/b&gt;</param>
-        <summary>Called when the activity is starting.</summary>
+                recently supplied in <c>#onSaveInstanceState</c>.
+                &lt;b&gt;<i>Note: Otherwise it is null.</i>&lt;/b&gt;</param>
+        <param name="persistentState">if the activity is being re-initialized after
+                previously being shut down or powered off then this Bundle contains the data it most
+                recently supplied to outPersistentState in <c>#onSaveInstanceState</c>.
+                &lt;b&gt;<i>Note: Otherwise it is null.</i>&lt;/b&gt;</param>
+        <summary>Same as <c>#onCreate(android.os.Bundle)</c> but called for those activities created with
+            the attribute <c>android.R.attr#persistableMode</c> set to
+            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onCreate(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onCreate(android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onCreate(android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onCreate(android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -3584,14 +3600,14 @@
       </Parameters>
       <Docs>
         <param name="id">The id of the dialog.</param>
-        <param name="args">The dialog arguments provided to <see cref="M:Android.App.Activity.ShowDialog(System.Int32,Android.OS.Bundle)" />.</param>
+        <param name="args">The dialog arguments provided to <c>#showDialog(int, Bundle)</c>.</param>
         <summary>Callback for creating dialogs that are managed (saved and restored) for you
- by the activity.</summary>
-        <returns>To be added.</returns>
+            by the activity.</summary>
+        <returns>The dialog.  If you return null, the dialog will not be created.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onCreateDialog(int)" title="Reference documentation">Java documentation for <code>android.app.Activity.onCreateDialog(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onCreateDialog(int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onCreateDialog(int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -3869,13 +3885,13 @@
         <param name="context">The context the view is being created in.</param>
         <param name="attrs">Inflation attributes as specified in XML file.</param>
         <summary>Standard implementation of
-            <c>android.view.LayoutInflater.Factory2#onCreateView(View, String, Context, AttributeSet)</c>
-            used when inflating with the LayoutInflater returned by <c>#getSystemService</c>.</summary>
+            <c>android.view.LayoutInflater.Factory#onCreateView</c> used when
+            inflating with the LayoutInflater returned by <c>#getSystemService</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onCreateView(android.view.View,%20java.lang.String,%20android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.app.Activity.onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onCreateView(java.lang.String,%20android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.app.Activity.onCreateView(java.lang.String, android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -4697,8 +4713,8 @@
         <Parameter Name="newConfig" Type="Android.Content.Res.Configuration" />
       </Parameters>
       <Docs>
-        <param name="newConfig">To be added.</param>
         <param name="isInMultiWindowMode">True if the activity is in multi-window mode.</param>
+        <param name="newConfig">To be added.</param>
         <summary>Called by the system when the activity changes from fullscreen mode to multi-window mode and
             visa-versa.</summary>
         <remarks>
@@ -5135,8 +5151,8 @@
         <Parameter Name="newConfig" Type="Android.Content.Res.Configuration" />
       </Parameters>
       <Docs>
-        <param name="newConfig">To be added.</param>
         <param name="isInPictureInPictureMode">True if the activity is in picture-in-picture mode.</param>
+        <param name="newConfig">To be added.</param>
         <summary>Called by the system when the activity changes to and from picture-in-picture mode.</summary>
         <remarks>
           <para>
@@ -5301,17 +5317,16 @@
         <Parameter Name="persistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
+        <param name="savedInstanceState">The data most recently supplied in <c>#onSaveInstanceState</c></param>
         <param name="persistentState">The data caming from the PersistableBundle first
- saved in <see cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle,Android.OS.PersistableBundle)" />.</param>
-        <param name="savedInstanceState">If the activity is being re-initialized after
-                previously being shut down then this Bundle contains the data it most
-                recently supplied in <c>#onSaveInstanceState</c>.  &lt;b&gt;<i>Note: Otherwise it is null.</i>&lt;/b&gt;</param>
-        <summary>Called when activity start-up is complete (after <c>#onStart</c>
-            and <c>#onRestoreInstanceState</c> have been called).</summary>
+            saved in <c>#onSaveInstanceState(Bundle, PersistableBundle)</c>.</param>
+        <summary>This is the same as <c>#onPostCreate(Bundle)</c> but is called for activities
+            created with the attribute <c>android.R.attr#persistableMode</c> set to
+            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onPostCreate(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onPostCreate(android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onPostCreate(android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onPostCreate(android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -5440,13 +5455,13 @@
       <Docs>
         <param name="id">The id of the managed dialog.</param>
         <param name="dialog">The dialog.</param>
-        <param name="args">The dialog arguments provided to <see cref="M:Android.App.Activity.ShowDialog(System.Int32,Android.OS.Bundle)" />.</param>
+        <param name="args">The dialog arguments provided to <c>#showDialog(int, Bundle)</c>.</param>
         <summary>Provides an opportunity to prepare a managed dialog before it is being
- shown.</summary>
+            shown.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onPrepareDialog(int,%20android.app.Dialog)" title="Reference documentation">Java documentation for <code>android.app.Activity.onPrepareDialog(int, android.app.Dialog)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onPrepareDialog(int,%20android.app.Dialog,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onPrepareDialog(int, android.app.Dialog, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -5919,15 +5934,17 @@
         <Parameter Name="persistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="persistentState">the data most recently supplied in <see cref="M:Android.App.Activity.OnSaveInstanceState(Android.OS.Bundle)" />.</param>
-        <param name="savedInstanceState">the data most recently supplied in <c>#onSaveInstanceState</c>.</param>
-        <summary>This method is called after <c>#onStart</c> when the activity is
-            being re-initialized from a previously saved state, given here in
-            &lt;var&gt;savedInstanceState&lt;/var&gt;.</summary>
+        <param name="savedInstanceState">the data most recently supplied in <c>#onSaveInstanceState</c>
+                or null.</param>
+        <param name="persistentState">the data most recently supplied in <c>#onSaveInstanceState</c>
+                or null.</param>
+        <summary>This is the same as <c>#onRestoreInstanceState(Bundle)</c> but is called for activities
+            created with the attribute <c>android.R.attr#persistableMode</c> set to
+            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onRestoreInstanceState(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onRestoreInstanceState(android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onRestoreInstanceState(android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onRestoreInstanceState(android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -6096,16 +6113,15 @@
         <Parameter Name="outPersistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="outPersistentState">State which will be saved across reboots.</param>
         <param name="outState">Bundle in which to place your saved state.</param>
-        <summary>Called to retrieve per-instance state from an activity before being killed
-            so that the state can be restored in <c>#onCreate</c> or
-            <c>#onRestoreInstanceState</c> (the <c>Bundle</c> populated by this method
-            will be passed to both).</summary>
+        <param name="outPersistentState">State which will be saved across reboots.</param>
+        <summary>This is the same as <c>#onSaveInstanceState</c> but is called for activities
+            created with the attribute <c>android.R.attr#persistableMode</c> set to
+            &lt;code&gt;persistAcrossReboots&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onSaveInstanceState(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onSaveInstanceState(android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onSaveInstanceState(android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.onSaveInstanceState(android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -6188,13 +6204,15 @@
         <Parameter Name="searchEvent" Type="Android.Views.SearchEvent" />
       </Parameters>
       <Docs>
-        <param name="searchEvent">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="searchEvent">The <c>SearchEvent</c> that signaled this search.</param>
+        <summary>This hook is called when the user signals the desire to start a search.</summary>
+        <returns>Returns <c>true</c> if search launched, and <c>false</c> if the activity does
+            not respond to search.  The default implementation always returns <c>true</c>, except
+            when in <c>Configuration#UI_MODE_TYPE_TELEVISION</c> mode where it returns false.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#onSearchRequested()" title="Reference documentation">Java documentation for <code>android.app.Activity.onSearchRequested()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#onSearchRequested(android.view.SearchEvent)" title="Reference documentation">Java documentation for <code>android.app.Activity.onSearchRequested(android.view.SearchEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -6848,8 +6866,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
         <param name="callback">The callback that should control the new action mode</param>
+        <param name="type">To be added.</param>
         <summary>Give the Activity a chance to control the UI for an action mode requested
             by the system.</summary>
         <returns>The new action mode, or &lt;code&gt;null&lt;/code&gt; if the activity does not want to
@@ -7874,12 +7892,11 @@
       </Parameters>
       <Docs>
         <param name="view">The desired content to display.</param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
-        <summary>Set the activity content from a layout resource.</summary>
+        <summary>Set the activity content to an explicit view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#setContentView(int)" title="Reference documentation">Java documentation for <code>android.app.Activity.setContentView(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#setContentView(android.view.View)" title="Reference documentation">Java documentation for <code>android.app.Activity.setContentView(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -7961,7 +7978,6 @@
       <Docs>
         <param name="view">The desired content to display.</param>
         <param name="params">Layout parameters for the view.</param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
         <summary>Set the activity content from a layout resource.</summary>
         <remarks>
           <para>
@@ -8772,15 +8788,15 @@
         <Parameter Name="data" Type="Android.Content.Intent" />
       </Parameters>
       <Docs>
-        <param name="data">The data to propagate back to the originating activity.</param>
         <param name="resultCode">The result code to propagate back to the originating
                               activity, often RESULT_CANCELED or RESULT_OK</param>
+        <param name="data">The data to propagate back to the originating activity.</param>
         <summary>Call this to set the result that your activity will return to its
             caller.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#setResult(int)" title="Reference documentation">Java documentation for <code>android.app.Activity.setResult(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#setResult(int,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.Activity.setResult(int, android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
@@ -9328,17 +9344,17 @@
       <Docs>
         <param name="id">The id of the managed dialog.</param>
         <param name="args">Arguments to pass through to the dialog.  These will be saved
- and restored for you.  Note that if the dialog is already created,
- <see cref="M:Android.App.Activity.OnCreateDialog(System.Int32,Android.OS.Bundle)" /> will not be called with the new
- arguments but <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='M:Android App Activity OnPrepareDialog(System Int32,Android App Dialog,Android App Dialog)';scope=Xamarin" title="M:Android.App.Activity.OnPrepareDialog(System.Int32,Android.App.Dialog,Android.App.Dialog)">M:Android.App.Activity.OnPrepareDialog(System.Int32,Android.App.Dialog,Android.App.Dialog)</a></format> will be.
- If you need to rebuild the dialog, call <see cref="M:Android.App.Activity.RemoveDialog(System.Int32)" /> first.</param>
-        <summary>Simple version of <c>#showDialog(int, Bundle)</c> that does not
-            take any arguments.</summary>
-        <returns>To be added.</returns>
+            and restored for you.  Note that if the dialog is already created,
+            <c>#onCreateDialog(int, Bundle)</c> will not be called with the new
+            arguments but <c>#onPrepareDialog(int, Dialog, Bundle)</c> will be.
+            If you need to rebuild the dialog, call <c>#removeDialog(int)</c> first.</param>
+        <summary>Show a dialog managed by this activity.</summary>
+        <returns>Returns true if the Dialog was created; false is returned if
+            it is not created because <c>#onCreateDialog(int, Bundle)</c> returns false.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#showDialog(int)" title="Reference documentation">Java documentation for <code>android.app.Activity.showDialog(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#showDialog(int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.showDialog(int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -9501,8 +9517,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
         <param name="callback">Callback that will manage lifecycle events for this action mode</param>
+        <param name="type">To be added.</param>
         <summary>Start an action mode of the default type <c>ActionMode#TYPE_PRIMARY</c>.</summary>
         <returns>The ActionMode that was started, or null if it was canceled</returns>
         <remarks>
@@ -9615,11 +9631,11 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <param name="intent">The intent to start.</param>
         <param name="requestCode">If &gt;= 0, this code will be returned in
                                onActivityResult() when the activity exits.</param>
+        <param name="options">Additional options for how the Activity should be started.
+ See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <summary>Same as calling <c>#startActivityForResult(Intent, int, Bundle)</c>
             with no options.</summary>
         <remarks>
@@ -9888,12 +9904,12 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <param name="intent">The intent to start.</param>
         <param name="requestCode">If &gt;= 0, this code will be returned in
                     onActivityResult() when the activity exits, as described in
                     <c>#startActivityForResult</c>.</param>
+        <param name="options">Additional options for how the Activity should be started.
+ See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <summary>Same as calling <c>#startActivityIfNeeded(Intent, int, Bundle)</c>
             with no options.</summary>
         <returns>If a new activity was launched then true is returned; otherwise
@@ -10027,11 +10043,6 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.  If options
- have also been supplied by the IntentSender, options given here will
- override any that conflict with those given by the IntentSender.
-</param>
         <param name="intent">The IntentSender to launch.</param>
         <param name="requestCode">If &gt;= 0, this code will be returned in
                                onActivityResult() when the activity exits.</param>
@@ -10042,6 +10053,11 @@
         <param name="flagsValues">Desired values for any bits set in
             &lt;var&gt;flagsMask&lt;/var&gt;</param>
         <param name="extraFlags">Always set to 0.</param>
+        <param name="options">Additional options for how the Activity should be started.
+ See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.  If options
+ have also been supplied by the IntentSender, options given here will
+ override any that conflict with those given by the IntentSender.
+</param>
         <summary>Same as calling <c>#startIntentSenderForResult(IntentSender, int,
             Intent, int, int, int, Bundle)</c> with no options.</summary>
         <remarks>
@@ -10188,12 +10204,14 @@
         <param name="flagsValues">To be added.</param>
         <param name="extraFlags">To be added.</param>
         <param name="options">To be added.</param>
-        <summary>Same as calling <c>#startIntentSenderFromChild(Activity, IntentSender,
-            int, Intent, int, int, int, Bundle)</c> with no options.</summary>
+        <summary>Like <c>#startActivityFromChild(Activity, Intent, int)</c>, but
+            taking a IntentSender; see
+            <c>#startIntentSenderForResult(IntentSender, int, Intent, int, int, int)</c>
+            for more information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#startIntentSenderFromChild(android.app.Activity,%20android.content.IntentSender,%20int,%20android.content.Intent,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.app.Activity.startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#startIntentSenderFromChild(android.app.Activity,%20android.content.IntentSender,%20int,%20android.content.Intent,%20int,%20int,%20int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Activity.startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -10401,12 +10419,12 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <param name="intent">The intent to dispatch to the next activity.  For
             correct behavior, this must be the same as the Intent that started
             your own activity; the only changes you can make are to the extras
             inside of it.</param>
+        <param name="options">Additional options for how the Activity should be started.
+ See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <summary>Same as calling <c>#startNextMatchingActivity(Intent, Bundle)</c> with
             no options.</summary>
         <returns>Returns a boolean indicating whether there was another Activity
@@ -10876,7 +10894,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Activity#setTitle(int)" title="Reference documentation">Java documentation for <code>android.app.Activity.setTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Activity#setTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.Activity.setTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/ActivityManager.xml b/docs/Mono.Android/en/Android.App/ActivityManager.xml
index d5fce43e0f..c6fe50500c 100644
--- a/docs/Mono.Android/en/Android.App/ActivityManager.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityManager.xml
@@ -1567,18 +1567,18 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for the operation, either null or
- as per <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" />.
-</param>
         <param name="taskId">The identifier of the task to be moved, as found in
             <c>RunningTaskInfo</c> or <c>RecentTaskInfo</c>.</param>
         <param name="flags">Additional operational flags.</param>
-        <summary>Equivalent to calling <c>#moveTaskToFront(int, int, Bundle)</c>
-            with a null options argument.</summary>
+        <param name="options">Additional options for the operation, either null or
+            as per <c>Context#startActivity(Intent, android.os.Bundle)
+            Context.startActivity(Intent, Bundle)</c>.</param>
+        <summary>Ask that the task associated with a given task ID be moved to the
+            front of the stack, so it is now visible to the user.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ActivityManager#moveTaskToFront(int,%20int)" title="Reference documentation">Java documentation for <code>android.app.ActivityManager.moveTaskToFront(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ActivityManager#moveTaskToFront(int,%20int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.ActivityManager.moveTaskToFront(int, int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/ActivityOptions.xml b/docs/Mono.Android/en/Android.App/ActivityOptions.xml
index 07c51ad48b..c4f9c66b5d 100644
--- a/docs/Mono.Android/en/Android.App/ActivityOptions.xml
+++ b/docs/Mono.Android/en/Android.App/ActivityOptions.xml
@@ -535,12 +535,22 @@
         <param name="activity">The Activity whose window contains the shared elements.</param>
         <param name="sharedElement">The View to transition to the started Activity.</param>
         <param name="sharedElementName">The shared element name as used in the target Activity. This
-                          must not be null.</param>
+                                     must not be null.</param>
         <summary>Create an ActivityOptions to transition between Activities using cross-Activity scene
- animations.</summary>
-        <returns>To be added.</returns>
+            animations.</summary>
+        <returns>Returns a new ActivityOptions object that you can use to
+                    supply these options as the options Bundle when starting an activity.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/ActivityOptions#makeSceneTransitionAnimation(android.app.Activity,%20android.view.View,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.ActivityOptions.makeSceneTransitionAnimation(android.app.Activity, android.view.View, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <altmember cref="M:Android.Transitions.Transition.SetEpicenterCallback(.EpicenterCallback)" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.App/AlarmManager.xml b/docs/Mono.Android/en/Android.App/AlarmManager.xml
index 659340bbfb..75920964aa 100644
--- a/docs/Mono.Android/en/Android.App/AlarmManager.xml
+++ b/docs/Mono.Android/en/Android.App/AlarmManager.xml
@@ -192,13 +192,12 @@
       </Parameters>
       <Docs>
         <param name="operation">IntentSender which matches a previously added
- IntentSender.</param>
-        <param name="listener">OnAlarmListener instance that is the target of a currently-set alarm.</param>
-        <summary>Remove any alarm scheduled to be delivered to the given <c>OnAlarmListener</c>.</summary>
+            IntentSender. This parameter must not be <c>null</c>.</param>
+        <summary>Remove any alarms with a matching <c>Intent</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlarmManager#cancel(android.app.OnAlarmListener)" title="Reference documentation">Java documentation for <code>android.app.AlarmManager.cancel(android.app.OnAlarmListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlarmManager#cancel(android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.app.AlarmManager.cancel(android.app.PendingIntent)</code>.</a>
             </format>
           </para>
           <para>
@@ -572,16 +571,24 @@
         <Parameter Name="operation" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="type">One of <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android App AlarmManager ELAPSED_REALTIME';scope=Xamarin" title="Android.App.AlarmManager.ELAPSED_REALTIME">Android.App.AlarmManager.ELAPSED_REALTIME</a></format>, <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android App AlarmManager ELAPSED_REALTIME_WAKEUP';scope=Xamarin" title="Android.App.AlarmManager.ELAPSED_REALTIME_WAKEUP">Android.App.AlarmManager.ELAPSED_REALTIME_WAKEUP</a></format>,
-        <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android App AlarmManager RTC';scope=Xamarin" title="Android.App.AlarmManager.RTC">Android.App.AlarmManager.RTC</a></format>, or <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android App AlarmManager RTC_WAKEUP';scope=Xamarin" title="Android.App.AlarmManager.RTC_WAKEUP">Android.App.AlarmManager.RTC_WAKEUP</a></format>.</param>
+        <param name="type">type of alarm.</param>
         <param name="triggerAtMillis">time in milliseconds that the alarm should go
- off, using the appropriate clock (depending on the alarm type).</param>
+            off, using the appropriate clock (depending on the alarm type).</param>
         <param name="operation">Action to perform when the alarm goes off;
- typically comes from <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='M:Android App PendingIntent GetBroadcast(Android Content Context,System Int32,System Int32,System Int32)';scope=Xamarin" title="M:Android.App.PendingIntent.GetBroadcast(Android.Content.Context,System.Int32,System.Int32,System.Int32)">M:Android.App.PendingIntent.GetBroadcast(Android.Content.Context,System.Int32,System.Int32,System.Int32)</a></format>.</param>
-        <summary>
-        </summary>
+            typically comes from <c>PendingIntent#getBroadcast
+            IntentSender.getBroadcast()</c>.</param>
+        <summary>Schedule an alarm.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AlarmManager#set(int,%20long,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.app.AlarmManager.set(int, long, android.app.PendingIntent)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <altmember cref="T:Android.OS.Handler" />
@@ -670,9 +677,6 @@
         <param name="info">To be added.</param>
         <param name="operation">Action to perform when the alarm goes off;
         typically comes from <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='M:Android App PendingIntent GetBroadcast(Android Content Context,System Int32,System Int32,System Int32)';scope=Xamarin" title="M:Android.App.PendingIntent.GetBroadcast(Android.Content.Context,System.Int32,System.Int32,System.Int32)">M:Android.App.PendingIntent.GetBroadcast(Android.Content.Context,System.Int32,System.Int32,System.Int32)</a></format>.</param>
-        <param name="info&#xA;@param&#xA;@param">operation Action to perform when the alarm goes off;
-                   typically comes from <c>PendingIntent#getBroadcast
-                   IntentSender.getBroadcast()</c>.</param>
         <summary>Schedule an alarm that represents an alarm clock, which will be used to notify the user
             when it goes off.</summary>
         <remarks>
@@ -854,15 +858,12 @@
         <Parameter Name="targetHandler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="tag">To be added.</param>
-        <param name="listener">To be added.</param>
-        <param name="targetHandler">To be added.</param>
         <param name="type">type of alarm.</param>
         <param name="triggerAtMillis">time in milliseconds that the alarm should go
                    off, using the appropriate clock (depending on the alarm type).</param>
-        <param name="operation">Action to perform when the alarm goes off;
-                   typically comes from <c>PendingIntent#getBroadcast
-                   IntentSender.getBroadcast()</c>.</param>
+        <param name="tag">To be added.</param>
+        <param name="listener">To be added.</param>
+        <param name="targetHandler">To be added.</param>
         <summary>Schedule an alarm to be delivered precisely at the stated time.</summary>
         <remarks>
           <para>
@@ -1270,9 +1271,6 @@
         <Parameter Name="targetHandler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="tag">To be added.</param>
-        <param name="listener">To be added.</param>
-        <param name="targetHandler">To be added.</param>
         <param name="type">type of alarm.</param>
         <param name="windowStartMillis">The earliest time, in milliseconds, that the alarm should
                    be delivered, expressed in the appropriate clock's units (depending on the alarm
@@ -1281,9 +1279,9 @@
                    in milliseconds.  The alarm will be delivered no later than this many
                    milliseconds after <c>windowStartMillis</c>.  Note that this parameter
                    is a <i>duration,</i> not the timestamp of the end of the window.</param>
-        <param name="operation">Action to perform when the alarm goes off;
-                   typically comes from <c>PendingIntent#getBroadcast
-                   IntentSender.getBroadcast()</c>.</param>
+        <param name="tag">To be added.</param>
+        <param name="listener">To be added.</param>
+        <param name="targetHandler">To be added.</param>
         <summary>Schedule an alarm to be delivered within a given window of time.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/AlertDialog.xml b/docs/Mono.Android/en/Android.App/AlertDialog.xml
index 475a07f223..d8f952c943 100644
--- a/docs/Mono.Android/en/Android.App/AlertDialog.xml
+++ b/docs/Mono.Android/en/Android.App/AlertDialog.xml
@@ -105,13 +105,15 @@
         <Parameter Name="themeResId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="themeResId">To be added.</param>
         <param name="context">the parent context</param>
-        <summary>Creates an alert dialog that uses the default alert dialog theme.</summary>
+        <param name="themeResId">the resource ID of the theme against which to inflate
+                              this dialog, or <c>0</c> to use the parent
+                              <c>context</c>'s default alert dialog theme</param>
+        <summary>Creates an alert dialog that uses an explicit theme resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#AlertDialog(android.content.Context)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.AlertDialog(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#AlertDialog(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.AlertDialog(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -168,9 +170,9 @@
         <Parameter Name="cancelListener" Type="Android.Content.IDialogInterfaceOnCancelListener" />
       </Parameters>
       <Docs>
+        <param name="context">the parent context</param>
         <param name="cancelable">To be added.</param>
         <param name="cancelListener">To be added.</param>
-        <param name="context">the parent context</param>
         <summary>Creates an alert dialog that uses the default alert dialog theme.</summary>
         <remarks>
           <para>
@@ -354,10 +356,6 @@
         <Parameter Name="listener" Type="Android.Content.IDialogInterfaceOnClickListener" />
       </Parameters>
       <Docs>
-        <param name="whichButton">Which button to set the listener on, can be one of
-                       <c>DialogInterface#BUTTON_POSITIVE</c>,
-                       <c>DialogInterface#BUTTON_NEGATIVE</c>, or
-                       <c>DialogInterface#BUTTON_NEUTRAL</c></param>
         <param name="text">The text to display in positive button.</param>
         <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
         <summary>Set a listener to be invoked when the specified button of the dialog is pressed.</summary>
@@ -404,18 +402,13 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="whichButton">Which button to set the listener on, can be one of
-                       <c>DialogInterface#BUTTON_POSITIVE</c>,
-                       <c>DialogInterface#BUTTON_NEGATIVE</c>, or
-                       <c>DialogInterface#BUTTON_NEUTRAL</c></param>
         <param name="text">The text to display in positive button.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
+        <param name="msg">To be added.</param>
         <summary>Set a listener to be invoked when the specified button of the dialog is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(int,%20java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(int, java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -477,10 +470,6 @@
         <Parameter Name="listener" Type="Android.Content.IDialogInterfaceOnClickListener" />
       </Parameters>
       <Docs>
-        <param name="whichButton">Which button to set the listener on, can be one of
-                       <c>DialogInterface#BUTTON_POSITIVE</c>,
-                       <c>DialogInterface#BUTTON_NEGATIVE</c>, or
-                       <c>DialogInterface#BUTTON_NEUTRAL</c></param>
         <param name="text">The text to display in positive button.</param>
         <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
         <summary>Set a listener to be invoked when the specified button of the dialog is pressed.</summary>
@@ -522,18 +511,13 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="whichButton">Which button to set the listener on, can be one of
-                       <c>DialogInterface#BUTTON_POSITIVE</c>,
-                       <c>DialogInterface#BUTTON_NEGATIVE</c>, or
-                       <c>DialogInterface#BUTTON_NEUTRAL</c></param>
         <param name="text">The text to display in positive button.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
+        <param name="msg">To be added.</param>
         <summary>Set a listener to be invoked when the specified button of the dialog is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(int,%20java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(int, java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -642,19 +626,17 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">The <see cref="T:Android.OS.Message" /> to be sent when clicked.
-</param>
-        <param name="whichButton">Which button to set the listener on, can be one of
+        <param name="whichButton">Which button to set the message for, can be one of
                        <c>DialogInterface#BUTTON_POSITIVE</c>,
                        <c>DialogInterface#BUTTON_NEGATIVE</c>, or
                        <c>DialogInterface#BUTTON_NEUTRAL</c></param>
         <param name="text">The text to display in positive button.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
-        <summary>Set a listener to be invoked when the specified button of the dialog is pressed.</summary>
+        <param name="msg">The <c>Message</c> to be sent when clicked.</param>
+        <summary>Set a message to be sent when a button is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(int,%20java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(int, java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(int,%20java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(int, java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -753,18 +735,17 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="whichButton">Which button to set the listener on, can be one of
+        <param name="whichButton">Which button to set the message for, can be one of
                        <c>DialogInterface#BUTTON_POSITIVE</c>,
                        <c>DialogInterface#BUTTON_NEGATIVE</c>, or
                        <c>DialogInterface#BUTTON_NEUTRAL</c></param>
         <param name="text">The text to display in positive button.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
-        <summary>Set a listener to be invoked when the specified button of the dialog is pressed.</summary>
+        <param name="msg">The <c>Message</c> to be sent when clicked.</param>
+        <summary>Set a message to be sent when a button is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(int,%20java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(int, java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton(int,%20java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton(int, java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -877,14 +858,13 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
         <param name="text">The text to display in button 2.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
+        <param name="msg">To be added.</param>
         <summary>Set a listener to be invoked when button 2 of the dialog is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton2(java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton2(java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton2(java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton2(java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -987,14 +967,13 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
         <param name="text">The text to display in button 2.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
+        <param name="msg">To be added.</param>
         <summary>Set a listener to be invoked when button 2 of the dialog is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton2(java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton2(java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton2(java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton2(java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -1105,14 +1084,13 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
         <param name="text">The text to display in button 3.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
+        <param name="msg">To be added.</param>
         <summary>Set a listener to be invoked when button 3 of the dialog is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton3(java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton3(java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton3(java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton3(java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -1215,14 +1193,13 @@
         <Parameter Name="msg" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
         <param name="text">The text to display in button 3.</param>
-        <param name="listener">The <c>DialogInterface.OnClickListener</c> to use.</param>
+        <param name="msg">To be added.</param>
         <summary>Set a listener to be invoked when button 3 of the dialog is pressed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton3(java.lang.CharSequence,%20android.content.OnClickListener)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton3(java.lang.CharSequence, android.content.OnClickListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setButton3(java.lang.CharSequence,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setButton3(java.lang.CharSequence, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -1324,8 +1301,6 @@
       </Parameters>
       <Docs>
         <param name="icon">To be added.</param>
-        <param name="resId">the resourceId of the drawable to use as the icon or 0
-            if you don't want an icon.</param>
         <summary>Set resId to 0 if you don't want an icon.</summary>
         <remarks>
           <para>
@@ -1583,11 +1558,12 @@
         <param name="viewSpacingTop">Extra space to appear above <c>view</c></param>
         <param name="viewSpacingRight">Extra space to appear to the right of <c>view</c></param>
         <param name="viewSpacingBottom">Extra space to appear below <c>view</c></param>
-        <summary>Set the view to display in that dialog.</summary>
+        <summary>Set the view to display in that dialog, specifying the spacing to appear around that
+            view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AlertDialog#setView(android.view.View)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setView(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AlertDialog#setView(android.view.View,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.app.AlertDialog.setView(android.view.View, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/AppOpsManager.xml b/docs/Mono.Android/en/Android.App/AppOpsManager.xml
index 874d5f3b2d..fe68b735c7 100644
--- a/docs/Mono.Android/en/Android.App/AppOpsManager.xml
+++ b/docs/Mono.Android/en/Android.App/AppOpsManager.xml
@@ -97,7 +97,16 @@
         <summary>Do a quick check for whether an application might be able to perform an operation.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#checkOp(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.checkOp(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 19" />
         <exception cref="T:Java.Lang.SecurityException">If the app has been configured to crash on this op.
@@ -146,7 +155,16 @@
  returns <see cref="F:Android.App.AppOpsManager.ModeErrored" />.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#checkOpNoThrow(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.checkOpNoThrow(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -233,7 +251,16 @@
         <summary>Report that an application is no longer performing an operation that had previously
  been started with <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='M:Android App AppOpsManager StartOp(System String,System Int32,System Int32)';scope=Xamarin" title="M:Android.App.AppOpsManager.StartOp(System.String,System.Int32,System.Int32)">M:Android.App.AppOpsManager.StartOp(System.String,System.Int32,System.Int32)</a></format>.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#finishOp(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.finishOp(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -267,8 +294,20 @@
         <param name="uid">To be added.</param>
         <param name="packageName">To be added.</param>
         <param name="attributionTag">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <summary>Report that an application is no longer performing an operation that had previously
+            been started with <c>#startOp(String, int, String, String, String)</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#finishOp(java.lang.String,%20int,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.finishOp(java.lang.String, int, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="FinishProxyOp">
@@ -640,7 +679,16 @@
         <summary>Make note of an application performing an operation.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteOp(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteOp(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <exception cref="T:Java.Lang.SecurityException">If the app has been configured to crash on this op.
 </exception>
@@ -679,14 +727,29 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="op">To be added.</param>
-        <param name="uid">To be added.</param>
-        <param name="packageName">To be added.</param>
-        <param name="attributionTag">To be added.</param>
-        <param name="message">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="op">The operation to note.  One of the OPSTR_* constants.</param>
+        <param name="uid">The uid of the application attempting to perform the operation.</param>
+        <param name="packageName">The name of the application attempting to perform the operation.</param>
+        <param name="attributionTag">The <c>Context#createAttributionContext attribution tag</c> of the
+                                  calling context or <c>null</c> for default attribution</param>
+        <param name="message">A message describing why the op was noted</param>
+        <summary>Make note of an application performing an operation and check if the application is allowed
+            to perform it.</summary>
+        <returns>Returns <c>#MODE_ALLOWED</c> if the operation is allowed, or
+            <c>#MODE_IGNORED</c> if it is not allowed and should be silently ignored (without
+            causing the app to crash).</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteOp(java.lang.String,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteOp(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="NoteOpNoThrow">
@@ -731,7 +794,16 @@
  returns <see cref="F:Android.App.AppOpsManager.ModeErrored" />.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteOpNoThrow(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteOpNoThrow(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -773,9 +845,21 @@
         <param name="packageName">To be added.</param>
         <param name="attributionTag">To be added.</param>
         <param name="message">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Like <c>#noteOp(String, int, String, String, String)</c> but instead of throwing a
+            <c>SecurityException</c> it returns <c>#MODE_ERRORED</c>.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteOpNoThrow(java.lang.String,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteOpNoThrow(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="NoteProxyOp">
@@ -817,7 +901,16 @@
         <summary>To be added.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteProxyOp(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteProxyOp(java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -854,14 +947,28 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="op">To be added.</param>
-        <param name="proxiedPackageName">To be added.</param>
-        <param name="proxiedUid">To be added.</param>
-        <param name="proxiedAttributionTag">To be added.</param>
-        <param name="message">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="op">The operation to note. One of the OPSTR_* constants.</param>
+        <param name="proxiedPackageName">The name of the application calling into the proxy application.</param>
+        <param name="proxiedUid">The uid of the proxied application</param>
+        <param name="proxiedAttributionTag">The proxied <c>Context#createAttributionContext
+            attribution tag</c> or <c>null</c> for default attribution</param>
+        <param name="message">A message describing the reason the op was noted</param>
+        <summary>Make note of an application performing an operation on behalf of another application when
+            handling an IPC.</summary>
+        <returns>Returns <c>#MODE_ALLOWED</c> if the operation is allowed, or <c>#MODE_IGNORED</c>
+            if it is not allowed and should be silently ignored (without causing the app to crash).</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteProxyOp(java.lang.String,%20java.lang.String,%20int,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteProxyOp(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="NoteProxyOpNoThrow">
@@ -903,7 +1010,16 @@
         <summary>To be added.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteProxyOpNoThrow(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteProxyOpNoThrow(java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -947,7 +1063,18 @@
         <param name="proxiedUid">To be added.</param>
         <summary>To be added.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteProxyOpNoThrow(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteProxyOpNoThrow(java.lang.String, java.lang.String, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="NoteProxyOpNoThrow">
@@ -988,9 +1115,21 @@
         <param name="proxiedUid">To be added.</param>
         <param name="proxiedAttributionTag">To be added.</param>
         <param name="message">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Like <c>#noteProxyOp(String, String, int, String, String)</c> but instead
+            of throwing a <c>SecurityException</c> it returns <c>#MODE_ERRORED</c>.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#noteProxyOpNoThrow(java.lang.String,%20java.lang.String,%20int,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.noteProxyOpNoThrow(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="OpstrAddVoicemail">
@@ -2296,7 +2435,16 @@
         <summary>Report that an application has started executing a long-running operation.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#startOp(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.startOp(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <exception cref="T:Java.Lang.SecurityException">If the app has been configured to crash on this op.
 </exception>
@@ -2335,14 +2483,28 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="op">To be added.</param>
-        <param name="uid">To be added.</param>
-        <param name="packageName">To be added.</param>
-        <param name="attributionTag">To be added.</param>
-        <param name="message">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="op">The operation to start.  One of the OPSTR_* constants.</param>
+        <param name="uid">The user id of the application attempting to perform the operation.</param>
+        <param name="packageName">The name of the application attempting to perform the operation.</param>
+        <param name="attributionTag">The <c>Context#createAttributionContext attribution tag</c> or
+            <c>null</c> for default attribution</param>
+        <param name="message">Description why op was started</param>
+        <summary>Report that an application has started executing a long-running operation.</summary>
+        <returns>Returns <c>#MODE_ALLOWED</c> if the operation is allowed, or
+            <c>#MODE_IGNORED</c> if it is not allowed and should be silently ignored (without
+            causing the app to crash).</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#startOp(java.lang.String,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.startOp(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="StartOpNoThrow">
@@ -2387,7 +2549,16 @@
  returns <see cref="F:Android.App.AppOpsManager.ModeErrored" />.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#startOpNoThrow(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.startOpNoThrow(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -2429,9 +2600,21 @@
         <param name="packageName">To be added.</param>
         <param name="attributionTag">To be added.</param>
         <param name="message">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Like <c>#startOp(String, int, String, String, String)</c> but instead of throwing a
+            <c>SecurityException</c> it returns <c>#MODE_ERRORED</c>.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#startOpNoThrow(java.lang.String,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.startOpNoThrow(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="StartProxyOp">
@@ -2517,9 +2700,21 @@
         <param name="proxiedPackageName">To be added.</param>
         <param name="proxiedAttributionTag">To be added.</param>
         <param name="message">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Like <c>#startProxyOp(String, int, String, String, String)</c> but instead
+            of throwing a <c>SecurityException</c> it returns <c>#MODE_ERRORED</c>.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#startProxyOpNoThrow(java.lang.String,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.startProxyOpNoThrow(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="StartWatchingActive">
@@ -2957,9 +3152,21 @@
         <param name="op">To be added.</param>
         <param name="uid">To be added.</param>
         <param name="packageName">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Like <c>#unsafeCheckOpNoThrow(String, int, String)</c> but returns the &lt;em&gt;raw&lt;/em&gt;
+            mode associated with the op.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AppOpsManager#unsafeCheckOpRawNoThrow(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.AppOpsManager.unsafeCheckOpRawNoThrow(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="WatchForegroundChanges">
diff --git a/docs/Mono.Android/en/Android.App/ApplicationErrorReport.xml b/docs/Mono.Android/en/Android.App/ApplicationErrorReport.xml
index 3ba4ae969e..58f025c0c4 100644
--- a/docs/Mono.Android/en/Android.App/ApplicationErrorReport.xml
+++ b/docs/Mono.Android/en/Android.App/ApplicationErrorReport.xml
@@ -242,9 +242,6 @@
         <param name="context">To be added.</param>
         <param name="packageName">To be added.</param>
         <param name="appFlags">To be added.</param>
-        <param name="pm">PackageManager instance</param>
-        <param name="errorPackage">package which caused the error</param>
-        <param name="receiverPackage">candidate package to receive the error</param>
         <summary>Return activity in receiverPackage that handles ACTION_APP_ERROR.</summary>
         <returns>activity component within receiverPackage which handles
             ACTION_APP_ERROR, or null if not found</returns>
diff --git a/docs/Mono.Android/en/Android.App/AuthenticationRequiredException.xml b/docs/Mono.Android/en/Android.App/AuthenticationRequiredException.xml
index 35e84b77c8..f98163bd2d 100644
--- a/docs/Mono.Android/en/Android.App/AuthenticationRequiredException.xml
+++ b/docs/Mono.Android/en/Android.App/AuthenticationRequiredException.xml
@@ -68,11 +68,26 @@
         <Parameter Name="userAction" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="userAction">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="cause">original cause with details designed for engineering
+                       audiences.</param>
+        <param name="userAction">primary action that will initiate the recovery. This
+                       must launch an activity that is expected to set
+                       <c>Activity#setResult(int)</c> before finishing to
+                       communicate the final status of the recovery. For example,
+                       apps that observe <c>Activity#RESULT_OK</c> may choose to
+                       immediately retry their operation.</param>
+        <summary>Create an instance ready to be thrown.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/AuthenticationRequiredException#AuthenticationRequiredException(java.lang.Throwable,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.app.AuthenticationRequiredException.AuthenticationRequiredException(java.lang.Throwable, android.app.PendingIntent)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.App/AutomaticZenRule.xml b/docs/Mono.Android/en/Android.App/AutomaticZenRule.xml
index b3247a781a..5ebcad296c 100644
--- a/docs/Mono.Android/en/Android.App/AutomaticZenRule.xml
+++ b/docs/Mono.Android/en/Android.App/AutomaticZenRule.xml
@@ -67,27 +67,6 @@
       </Parameters>
       <Docs>
         <param name="source">To be added.</param>
-        <param name="name">The name of the rule.</param>
-        <param name="owner">The Condition Provider service that owns this rule. This can be null if you're
-                         using <c>NotificationManager#setAutomaticZenRuleState(String, Condition)</c>
-                         instead of <c>android.service.notification.ConditionProviderService</c>.</param>
-        <param name="configurationActivity">An activity that handles
-                                         <c>NotificationManager#ACTION_AUTOMATIC_ZEN_RULE</c> that shows
-                                         the user
-                                         more information about this rule and/or allows them to
-                                         configure it. This is required if you are not using a
-                                         <c>android.service.notification.ConditionProviderService</c>.
-                                         If you are, it overrides the information specified in your
-                                         manifest.</param>
-        <param name="conditionId">A representation of the state that should cause your app to apply the
-                               given interruption filter.</param>
-        <param name="interruptionFilter">The interruption filter defines which notifications are allowed to
-                                      interrupt the user (e.g. via sound &amp;amp; vibration) while this rule
-                                      is active.</param>
-        <param name="policy">The policy defines which notifications are allowed to interrupt the user
-                          while this rule is active. This overrides the global policy while this rule is
-                          action (<c>Condition#STATE_TRUE</c>).</param>
-        <param name="enabled">Whether the rule is enabled.</param>
         <summary>Creates an automatic zen rule.</summary>
         <remarks>
           <para>
@@ -131,32 +110,19 @@
         <Parameter Name="enabled" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="name">The name of the rule.</param>
-        <param name="owner">The Condition Provider service that owns this rule. This can be null if you're
-                         using <c>NotificationManager#setAutomaticZenRuleState(String, Condition)</c>
-                         instead of <c>android.service.notification.ConditionProviderService</c>.</param>
-        <param name="configurationActivity">An activity that handles
-                                         <c>NotificationManager#ACTION_AUTOMATIC_ZEN_RULE</c> that shows
-                                         the user
-                                         more information about this rule and/or allows them to
-                                         configure it. This is required if you are not using a
-                                         <c>android.service.notification.ConditionProviderService</c>.
-                                         If you are, it overrides the information specified in your
-                                         manifest.</param>
         <param name="conditionId">A representation of the state that should cause your app to apply the
                                given interruption filter.</param>
+        <param name="name">The name of the rule.</param>
+        <param name="owner">The Condition Provider service that owns this rule.</param>
         <param name="interruptionFilter">The interruption filter defines which notifications are allowed to
                                       interrupt the user (e.g. via sound &amp;amp; vibration) while this rule
                                       is active.</param>
-        <param name="policy">The policy defines which notifications are allowed to interrupt the user
-                          while this rule is active. This overrides the global policy while this rule is
-                          action (<c>Condition#STATE_TRUE</c>).</param>
         <param name="enabled">Whether the rule is enabled.</param>
         <summary>Creates an automatic zen rule.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/AutomaticZenRule#AutomaticZenRule(java.lang.String,%20android.content.ComponentName,%20android.content.ComponentName,%20android.net.Uri,%20android.service.notification.ZenPolicy,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.AutomaticZenRule.AutomaticZenRule(java.lang.String, android.content.ComponentName, android.content.ComponentName, android.net.Uri, android.service.notification.ZenPolicy, int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/AutomaticZenRule#AutomaticZenRule(java.lang.String,%20android.content.ComponentName,%20android.net.Uri,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.AutomaticZenRule.AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/DatePickerDialog.xml b/docs/Mono.Android/en/Android.App/DatePickerDialog.xml
index 47a92775f9..40091b1fdf 100644
--- a/docs/Mono.Android/en/Android.App/DatePickerDialog.xml
+++ b/docs/Mono.Android/en/Android.App/DatePickerDialog.xml
@@ -108,14 +108,15 @@
         <Parameter Name="themeResId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="themeResId">To be added.</param>
         <param name="context">the parent context</param>
-        <summary>Creates a new date picker dialog for the current date using the parent
-            context's default date picker dialog theme.</summary>
+        <param name="themeResId">the resource ID of the theme against which to inflate
+                              this dialog, or <c>0</c> to use the parent
+                              <c>context</c>'s default alert dialog theme</param>
+        <summary>Creates a new date picker dialog for the current date.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/DatePickerDialog#DatePickerDialog(android.content.Context)" title="Reference documentation">Java documentation for <code>android.app.DatePickerDialog.DatePickerDialog(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/DatePickerDialog#DatePickerDialog(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.app.DatePickerDialog.DatePickerDialog(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -173,11 +174,11 @@
         <Parameter Name="dayOfMonth" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">the parent context</param>
         <param name="listener">To be added.</param>
         <param name="year">To be added.</param>
         <param name="month">To be added.</param>
         <param name="dayOfMonth">To be added.</param>
-        <param name="context">the parent context</param>
         <summary>Creates a new date picker dialog for the current date using the parent
             context's default date picker dialog theme.</summary>
         <remarks>
@@ -249,12 +250,12 @@
         <Parameter Name="dayOfMonth" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">the parent context</param>
         <param name="themeResId">To be added.</param>
         <param name="listener">To be added.</param>
         <param name="year">To be added.</param>
         <param name="monthOfYear">To be added.</param>
         <param name="dayOfMonth">To be added.</param>
-        <param name="context">the parent context</param>
         <summary>Creates a new date picker dialog for the current date using the parent
             context's default date picker dialog theme.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.App/Dialog.xml b/docs/Mono.Android/en/Android.App/Dialog.xml
index 3c07187b11..64db190231 100644
--- a/docs/Mono.Android/en/Android.App/Dialog.xml
+++ b/docs/Mono.Android/en/Android.App/Dialog.xml
@@ -114,13 +114,14 @@
         <Parameter Name="themeResId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="themeResId">To be added.</param>
         <param name="context">the context in which the dialog should run</param>
-        <summary>Creates a dialog window that uses the default dialog theme.</summary>
+        <param name="themeResId">a style resource describing the theme to use for the
+                         window, or <c>0</c> to use the default dialog theme</param>
+        <summary>Creates a dialog window that uses a custom dialog style.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Dialog#Dialog(android.content.Context)" title="Reference documentation">Java documentation for <code>android.app.Dialog.Dialog(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Dialog#Dialog(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.app.Dialog.Dialog(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -177,9 +178,9 @@
         <Parameter Name="cancelListener" Type="Android.Content.IDialogInterfaceOnCancelListener" />
       </Parameters>
       <Docs>
+        <param name="context">the context in which the dialog should run</param>
         <param name="cancelable">To be added.</param>
         <param name="cancelListener">To be added.</param>
-        <param name="context">the context in which the dialog should run</param>
         <summary>Creates a dialog window that uses the default dialog theme.</summary>
         <remarks>
           <para>
@@ -2445,7 +2446,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Dialog#onSearchRequested()" title="Reference documentation">Java documentation for <code>android.app.Dialog.onSearchRequested()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Dialog#onSearchRequested(android.view.SearchEvent)" title="Reference documentation">Java documentation for <code>android.app.Dialog.onSearchRequested(android.view.SearchEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -3212,14 +3213,12 @@
         <Parameter Name="view" Type="Android.Views.View" />
       </Parameters>
       <Docs>
-        <param name="view">The desired content to display.
-</param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
-        <summary>Set the screen content from a layout resource.</summary>
+        <param name="view">The desired content to display.</param>
+        <summary>Set the screen content to an explicit view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Dialog#setContentView(int)" title="Reference documentation">Java documentation for <code>android.app.Dialog.setContentView(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Dialog#setContentView(android.view.View)" title="Reference documentation">Java documentation for <code>android.app.Dialog.setContentView(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -3298,7 +3297,6 @@
         <param name="view">The desired content to display.</param>
         <param name="params">Layout parameters for the view.
 </param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
         <summary>Set the screen content from a layout resource.</summary>
         <remarks>
           <para>
@@ -3710,14 +3708,12 @@
         <Parameter Name="title" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="title">The new text to display in the title.
-</param>
-        <param name="titleId">the title's text resource identifier</param>
+        <param name="title">The new text to display in the title.</param>
         <summary>Set the title text for this dialog's window.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Dialog#setTitle(int)" title="Reference documentation">Java documentation for <code>android.app.Dialog.setTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Dialog#setTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.Dialog.setTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -3786,13 +3782,12 @@
         <Parameter Name="title" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="title">To be added.</param>
-        <param name="titleId">the title's text resource identifier</param>
+        <param name="title">The new text to display in the title.</param>
         <summary>Set the title text for this dialog's window.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Dialog#setTitle(int)" title="Reference documentation">Java documentation for <code>android.app.Dialog.setTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Dialog#setTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.Dialog.setTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/DialogFragment.xml b/docs/Mono.Android/en/Android.App/DialogFragment.xml
index 3f62fc8cd4..2b16f9cef2 100644
--- a/docs/Mono.Android/en/Android.App/DialogFragment.xml
+++ b/docs/Mono.Android/en/Android.App/DialogFragment.xml
@@ -567,15 +567,16 @@
       </Parameters>
       <Docs>
         <param name="transaction">An existing transaction in which to add the fragment.</param>
-        <param name="manager">The FragmentManager this fragment will be added to.</param>
         <param name="tag">The tag for this fragment, as per
             <c>FragmentTransaction#add(Fragment, String) FragmentTransaction.add</c>.</param>
-        <summary>Display the dialog, adding the fragment to the given FragmentManager.</summary>
-        <returns>To be added.</returns>
+        <summary>Display the dialog, adding the fragment using an existing transaction
+            and then committing the transaction.</summary>
+        <returns>Returns the identifier of the committed transaction, as per
+            <c>FragmentTransaction#commit() FragmentTransaction.commit()</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/DialogFragment#show(android.app.FragmentManager,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.DialogFragment.show(android.app.FragmentManager, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/DialogFragment#show(android.app.FragmentTransaction,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.DialogFragment.show(android.app.FragmentTransaction, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/DownloadManager.xml b/docs/Mono.Android/en/Android.App/DownloadManager.xml
index 5b6667c909..76e520447e 100644
--- a/docs/Mono.Android/en/Android.App/DownloadManager.xml
+++ b/docs/Mono.Android/en/Android.App/DownloadManager.xml
@@ -1788,7 +1788,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/DownloadManager#remove(long)" title="Reference documentation">Java documentation for <code>android.app.DownloadManager.remove(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/DownloadManager#remove(long[])" title="Reference documentation">Java documentation for <code>android.app.DownloadManager.remove(long[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/Fragment.xml b/docs/Mono.Android/en/Android.App/Fragment.xml
index da6887f573..5acda8f62b 100644
--- a/docs/Mono.Android/en/Android.App/Fragment.xml
+++ b/docs/Mono.Android/en/Android.App/Fragment.xml
@@ -766,8 +766,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="formatArgs">To be added.</param>
         <param name="resId">Resource id for the string</param>
+        <param name="formatArgs">To be added.</param>
         <summary>Return a localized string from the application's package's
             default string table.</summary>
         <returns>To be added.</returns>
@@ -1031,17 +1031,16 @@
       </Parameters>
       <Docs>
         <param name="context">The calling context being used to instantiate the fragment.
- This is currently just used to get its ClassLoader.</param>
+            This is currently just used to get its ClassLoader.</param>
         <param name="fname">The class name of the fragment to instantiate.</param>
         <param name="args">Bundle of arguments to supply to the fragment, which it
- can retrieve with <see cref="P:Android.App.Fragment.Arguments" />.  May be null.</param>
-        <summary>Like <c>#instantiate(Context, String, Bundle)</c> but with a null
-            argument Bundle.</summary>
-        <returns>To be added.</returns>
+            can retrieve with <c>#getArguments()</c>.  May be null.</param>
+        <summary>Create a new instance of a Fragment with the given class name.</summary>
+        <returns>Returns a new fragment instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Fragment#instantiate(android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.Fragment.instantiate(android.content.Context, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Fragment#instantiate(android.content.Context,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Fragment.instantiate(android.content.Context, java.lang.String, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1681,11 +1680,11 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Called when a fragment is first attached to its context.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Fragment#onAttach(android.app.Activity)" title="Reference documentation">Java documentation for <code>android.app.Fragment.onAttach(android.app.Activity)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Fragment#onAttach(android.content.Context)" title="Reference documentation">Java documentation for <code>android.app.Fragment.onAttach(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -2372,7 +2371,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Fragment#onInflate(android.app.Activity,%20android.util.AttributeSet,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Fragment.onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Fragment#onInflate(android.util.AttributeSet,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Fragment.onInflate(android.util.AttributeSet, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -2591,8 +2590,8 @@
         <Parameter Name="newConfig" Type="Android.Content.Res.Configuration" />
       </Parameters>
       <Docs>
-        <param name="newConfig">To be added.</param>
         <param name="isInMultiWindowMode">True if the activity is in multi-window mode.</param>
+        <param name="newConfig">To be added.</param>
         <summary>Called when the Fragment's activity changes from fullscreen mode to multi-window mode and
             visa-versa.</summary>
         <remarks>
@@ -2814,8 +2813,8 @@
         <Parameter Name="newConfig" Type="Android.Content.Res.Configuration" />
       </Parameters>
       <Docs>
-        <param name="newConfig">To be added.</param>
         <param name="isInPictureInPictureMode">True if the activity is in picture-in-picture mode.</param>
+        <param name="newConfig">To be added.</param>
         <summary>Called by the system when the activity changes to and from picture-in-picture mode.</summary>
         <remarks>
           <para>
@@ -4117,10 +4116,10 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
+        <param name="intent">The intent to start.</param>
         <param name="options">Additional options for how the Activity should be started.
  See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.
 </param>
-        <param name="intent">The intent to start.</param>
         <summary>Call <c>Activity#startActivity(Intent)</c> from the fragment's
             containing Activity.</summary>
         <remarks>
@@ -4217,12 +4216,12 @@
         <param name="intent">To be added.</param>
         <param name="requestCode">To be added.</param>
         <param name="options">To be added.</param>
-        <summary>Call <c>Activity#startActivityForResult(Intent, int)</c> from the fragment's
+        <summary>Call <c>Activity#startActivityForResult(Intent, int, Bundle)</c> from the fragment's
             containing Activity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Fragment#startActivityForResult(android.content.Intent,%20int)" title="Reference documentation">Java documentation for <code>android.app.Fragment.startActivityForResult(android.content.Intent, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Fragment#startActivityForResult(android.content.Intent,%20int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Fragment.startActivityForResult(android.content.Intent, int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/FragmentController.xml b/docs/Mono.Android/en/Android.App/FragmentController.xml
index 6553c98756..857f5a960f 100644
--- a/docs/Mono.Android/en/Android.App/FragmentController.xml
+++ b/docs/Mono.Android/en/Android.App/FragmentController.xml
@@ -569,7 +569,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentController#dispatchMultiWindowModeChanged(boolean)" title="Reference documentation">Java documentation for <code>android.app.FragmentController.dispatchMultiWindowModeChanged(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentController#dispatchMultiWindowModeChanged(boolean,%20android.content.res.Configuration)" title="Reference documentation">Java documentation for <code>android.app.FragmentController.dispatchMultiWindowModeChanged(boolean, android.content.res.Configuration)</code>.</a>
             </format>
           </para>
           <para>
@@ -790,7 +790,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentController#dispatchPictureInPictureModeChanged(boolean)" title="Reference documentation">Java documentation for <code>android.app.FragmentController.dispatchPictureInPictureModeChanged(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentController#dispatchPictureInPictureModeChanged(boolean,%20android.content.res.Configuration)" title="Reference documentation">Java documentation for <code>android.app.FragmentController.dispatchPictureInPictureModeChanged(boolean, android.content.res.Configuration)</code>.</a>
             </format>
           </para>
           <para>
@@ -1595,7 +1595,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentController#restoreAllState(android.os.Parcelable,%20android.app.FragmentManagerNonConfig)" title="Reference documentation">Java documentation for <code>android.app.FragmentController.restoreAllState(android.os.Parcelable, android.app.FragmentManagerNonConfig)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentController#restoreAllState(android.os.Parcelable,%20java.util.List)" title="Reference documentation">Java documentation for <code>android.app.FragmentController.restoreAllState(android.os.Parcelable, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/FragmentManager.xml b/docs/Mono.Android/en/Android.App/FragmentManager.xml
index 43e8620a6b..28a1e07b44 100644
--- a/docs/Mono.Android/en/Android.App/FragmentManager.xml
+++ b/docs/Mono.Android/en/Android.App/FragmentManager.xml
@@ -865,18 +865,17 @@
       </Parameters>
       <Docs>
         <param name="id">Identifier of the stated to be popped. If no identifier exists,
- false is returned.
- The identifier is the number returned by
- <see cref="M:Android.App.FragmentTransaction.Commit" />.  The
- <see cref="F:Android.App.FragmentManager.PopBackStackInclusive" /> flag can be used to control whether
- the named state itself is popped.</param>
-        <param name="flags">Either 0 or <see cref="F:Android.App.FragmentManager.PopBackStackInclusive" />.
-</param>
-        <summary>Pop the top state off the back stack.</summary>
+            false is returned.
+            The identifier is the number returned by
+            <c>FragmentTransaction#commit() FragmentTransaction.commit()</c>.  The
+            <c>#POP_BACK_STACK_INCLUSIVE</c> flag can be used to control whether
+            the named state itself is popped.</param>
+        <param name="flags">Either 0 or <c>#POP_BACK_STACK_INCLUSIVE</c>.</param>
+        <summary>Pop all back stack states up to the one with the given identifier.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStack()" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStack()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStack(int,%20int)" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStack(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -920,16 +919,16 @@
       </Parameters>
       <Docs>
         <param name="name">If non-null, this is the name of a previous back state
- to look for; if found, all states up to that state will be popped.  The
- <see cref="F:Android.App.FragmentManager.PopBackStackInclusive" /> flag can be used to control whether
- the named state itself is popped. If null, only the top state is popped.</param>
-        <param name="flags">Either 0 or <see cref="F:Android.App.FragmentManager.PopBackStackInclusive" />.
-</param>
-        <summary>Pop the top state off the back stack.</summary>
+            to look for; if found, all states up to that state will be popped.  The
+            <c>#POP_BACK_STACK_INCLUSIVE</c> flag can be used to control whether
+            the named state itself is popped. If null, only the top state is popped.</param>
+        <param name="flags">Either 0 or <c>#POP_BACK_STACK_INCLUSIVE</c>.</param>
+        <summary>Pop the last fragment transition from the manager's fragment
+            back stack.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStack()" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStack()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStack(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStack(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1013,13 +1012,13 @@
       <Docs>
         <param name="id">To be added.</param>
         <param name="flags">To be added.</param>
-        <summary>Like <c>#popBackStack()</c>, but performs the operation immediately
+        <summary>Like <c>#popBackStack(int, int)</c>, but performs the operation immediately
             inside of the call.</summary>
         <returns>Returns true if there was something popped, else false.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStackImmediate()" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStackImmediate()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStackImmediate(int,%20int)" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStackImmediate(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1064,13 +1063,13 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="flags">To be added.</param>
-        <summary>Like <c>#popBackStack()</c>, but performs the operation immediately
+        <summary>Like <c>#popBackStack(String, int)</c>, but performs the operation immediately
             inside of the call.</summary>
         <returns>Returns true if there was something popped, else false.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStackImmediate()" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStackImmediate()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentManager#popBackStackImmediate(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.app.FragmentManager.popBackStackImmediate(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/FragmentTransaction.xml b/docs/Mono.Android/en/Android.App/FragmentTransaction.xml
index a01fa3396f..03788745f6 100644
--- a/docs/Mono.Android/en/Android.App/FragmentTransaction.xml
+++ b/docs/Mono.Android/en/Android.App/FragmentTransaction.xml
@@ -116,12 +116,12 @@
       <Docs>
         <param name="fragment">To be added.</param>
         <param name="tag">To be added.</param>
-        <summary>Calls <c>#add(int, Fragment, String)</c> with a null tag.</summary>
+        <summary>Calls <c>#add(int, Fragment, String)</c> with a 0 containerViewId.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#add(int,%20android.app.Fragment)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.add(int, android.app.Fragment)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#add(android.app.Fragment,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.add(android.app.Fragment, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,17 +202,18 @@
       </Parameters>
       <Docs>
         <param name="containerViewId">Optional identifier of the container this fragment is
- to be placed in.  If 0, it will not be placed in a container.</param>
+            to be placed in.  If 0, it will not be placed in a container.</param>
         <param name="fragment">The fragment to be added.  This fragment must not already
- be added to the activity.</param>
+            be added to the activity.</param>
         <param name="tag">Optional tag name for the fragment, to later retrieve the
- fragment with <see cref="M:Android.App.FragmentManager.FindFragmentByTag(System.String)" />.</param>
-        <summary>Calls <c>#add(int, Fragment, String)</c> with a null tag.</summary>
-        <returns>To be added.</returns>
+            fragment with <c>FragmentManager#findFragmentByTag(String)
+            FragmentManager.findFragmentByTag(String)</c>.</param>
+        <summary>Add a fragment to the activity state.</summary>
+        <returns>Returns the same FragmentTransaction instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#add(int,%20android.app.Fragment)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.add(int, android.app.Fragment)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#add(int,%20android.app.Fragment,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.add(int, android.app.Fragment, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -823,16 +824,17 @@
       </Parameters>
       <Docs>
         <param name="containerViewId">Identifier of the container whose fragment(s) are
- to be replaced.</param>
+            to be replaced.</param>
         <param name="fragment">The new fragment to place in the container.</param>
         <param name="tag">Optional tag name for the fragment, to later retrieve the
- fragment with <see cref="M:Android.App.FragmentManager.FindFragmentByTag(System.String)" />.</param>
-        <summary>Calls <c>#replace(int, Fragment, String)</c> with a null tag.</summary>
-        <returns>To be added.</returns>
+            fragment with <c>FragmentManager#findFragmentByTag(String)
+            FragmentManager.findFragmentByTag(String)</c>.</param>
+        <summary>Replace an existing fragment that was added to a container.</summary>
+        <returns>Returns the same FragmentTransaction instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#replace(int,%20android.app.Fragment)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.replace(int, android.app.Fragment)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#replace(int,%20android.app.Fragment,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.replace(int, android.app.Fragment, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -909,14 +911,14 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <param name="res">A string resource containing the title.</param>
-        <summary>Set the short title to show as a bread crumb when this transaction
-            is on the back stack, as used by <c>FragmentBreadCrumbs</c>.</summary>
+        <summary>Like <c>#setBreadCrumbShortTitle(int)</c> but taking a raw string; this
+            method is &lt;em&gt;not&lt;/em&gt; recommended, as the string can not be changed
+            later if the locale changes.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbShortTitle(int)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbShortTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbShortTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbShortTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -994,14 +996,14 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <param name="res">A string resource containing the title.</param>
-        <summary>Set the short title to show as a bread crumb when this transaction
-            is on the back stack, as used by <c>FragmentBreadCrumbs</c>.</summary>
+        <summary>Like <c>#setBreadCrumbShortTitle(int)</c> but taking a raw string; this
+            method is &lt;em&gt;not&lt;/em&gt; recommended, as the string can not be changed
+            later if the locale changes.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbShortTitle(int)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbShortTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbShortTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbShortTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1036,14 +1038,14 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <param name="res">A string resource containing the title.</param>
-        <summary>Set the full title to show as a bread crumb when this transaction
-            is on the back stack, as used by <c>FragmentBreadCrumbs</c>.</summary>
+        <summary>Like <c>#setBreadCrumbTitle(int)</c> but taking a raw string; this
+            method is &lt;em&gt;not&lt;/em&gt; recommended, as the string can not be changed
+            later if the locale changes.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbTitle(int)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1121,14 +1123,14 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <param name="res">A string resource containing the title.</param>
-        <summary>Set the full title to show as a bread crumb when this transaction
-            is on the back stack, as used by <c>FragmentBreadCrumbs</c>.</summary>
+        <summary>Like <c>#setBreadCrumbTitle(int)</c> but taking a raw string; this
+            method is &lt;em&gt;not&lt;/em&gt; recommended, as the string can not be changed
+            later if the locale changes.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbTitle(int)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setBreadCrumbTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setBreadCrumbTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1219,7 +1221,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setCustomAnimations(int,%20int)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setCustomAnimations(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/FragmentTransaction#setCustomAnimations(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.app.FragmentTransaction.setCustomAnimations(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/Instrumentation.xml b/docs/Mono.Android/en/Android.App/Instrumentation.xml
index 62bd40e47a..89ae51d7ff 100644
--- a/docs/Mono.Android/en/Android.App/Instrumentation.xml
+++ b/docs/Mono.Android/en/Android.App/Instrumentation.xml
@@ -197,7 +197,6 @@
         <param name="block">Controls whether the monitor should block the activity 
               start (returning its canned result) or let the call
               proceed.</param>
-        <param name="monitor">The new ActivityMonitor to see.</param>
         <summary>Add a new <c>ActivityMonitor</c> that will be checked whenever an 
             activity is started.</summary>
         <returns>To be added.</returns>
@@ -249,7 +248,6 @@
         <param name="block">Controls whether the monitor should block the activity 
               start (returning its canned result) or let the call
               proceed.</param>
-        <param name="monitor">The new ActivityMonitor to see.</param>
         <summary>Add a new <c>ActivityMonitor</c> that will be checked whenever an 
             activity is started.</summary>
         <returns>To be added.</returns>
@@ -451,16 +449,15 @@
         <Parameter Name="persistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="persistentState">The previously persisted state (or null)
-</param>
         <param name="activity">The activity being created.</param>
-        <param name="icicle">The previously frozen state (or null) to pass through to onCreate().</param>
+        <param name="icicle">The previously frozen state (or null) to pass through to</param>
+        <param name="persistentState">The previously persisted state (or null)</param>
         <summary>Perform calling of an activity's <c>Activity#onCreate</c>
             method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnCreate(android.app.Activity,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnCreate(android.app.Activity, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnCreate(android.app.Activity,%20android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnCreate(android.app.Activity, android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -693,15 +690,15 @@
         <Parameter Name="persistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="persistentState">To be added.</param>
         <param name="activity">The activity being created.</param>
-        <param name="savedInstanceState">The previously saved state (or null) to pass through to
+        <param name="savedInstanceState">The previously frozen state (or null) to pass through to
                           onPostCreate().</param>
+        <param name="persistentState">The previously persisted state (or null)</param>
         <summary>Perform calling of an activity's <c>Activity#onPostCreate</c> method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnPostCreate(android.app.Activity,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnPostCreate(android.app.Activity, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnPostCreate(android.app.Activity,%20android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnPostCreate(android.app.Activity, android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -821,16 +818,15 @@
         <Parameter Name="persistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="persistentState">The previously persisted state (or null)
-</param>
         <param name="activity">The activity being restored.</param>
-        <param name="savedInstanceState">The previously saved state being restored.</param>
+        <param name="savedInstanceState">The previously saved state being restored (or null).</param>
+        <param name="persistentState">The previously persisted state (or null)</param>
         <summary>Perform calling of an activity's <c>Activity#onRestoreInstanceState</c>
             method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnRestoreInstanceState(android.app.Activity,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnRestoreInstanceState(android.app.Activity, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnRestoreInstanceState(android.app.Activity,%20android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnRestoreInstanceState(android.app.Activity, android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -949,16 +945,15 @@
         <Parameter Name="outPersistentState" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="outPersistentState">The persistent bundle to pass to the call.
-</param>
         <param name="activity">The activity being saved.</param>
         <param name="outState">The bundle to pass to the call.</param>
+        <param name="outPersistentState">The persistent bundle to pass to the call.</param>
         <summary>Perform calling of an activity's <c>Activity#onSaveInstanceState</c>
             method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnSaveInstanceState(android.app.Activity,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnSaveInstanceState(android.app.Activity, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#callActivityOnSaveInstanceState(android.app.Activity,%20android.os.Bundle,%20android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.callActivityOnSaveInstanceState(android.app.Activity, android.os.Bundle, android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1360,13 +1355,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
-        <summary>Gets the <c>UiAutomation</c> instance with no flags set.</summary>
+        <param name="flags">The flags to be passed to the UiAutomation, for example
+                   <c>UiAutomation#FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES</c>,
+                   <c>UiAutomation#FLAG_DONT_USE_ACCESSIBILITY</c>.</param>
+        <summary>Gets the <c>UiAutomation</c> instance with flags set.</summary>
         <returns>The UI automation instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#getUiAutomation()" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.getUiAutomation()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#getUiAutomation(int)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.getUiAutomation(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1579,25 +1576,15 @@
       <Docs>
         <param name="cl">The ClassLoader with which to instantiate the object.</param>
         <param name="className">The name of the class implementing the Activity
-                  object.</param>
-        <param name="clazz">The Class of the desired Activity</param>
-        <param name="context">The base context for the activity to use</param>
-        <param name="token">The token for this activity to communicate with</param>
-        <param name="application">The application object (if any)</param>
-        <param name="intent">The intent that started this Activity</param>
-        <param name="info">ActivityInfo from the manifest</param>
-        <param name="title">The title, typically retrieved from the ActivityInfo record</param>
-        <param name="parent">The parent Activity (if any)</param>
-        <param name="id">The embedded Id (if any)</param>
-        <param name="lastNonConfigurationInstance">Arbitrary object that will be
-            available via <c>Activity#getLastNonConfigurationInstance()
-            Activity.getLastNonConfigurationInstance()</c>.</param>
-        <summary>Perform instantiation of an <c>Activity</c> object.</summary>
-        <returns>Returns the instantiated activity</returns>
+                             object.</param>
+        <param name="intent">The Intent object that specified the activity class being
+                          instantiated.</param>
+        <summary>Perform instantiation of the process's <c>Activity</c> object.</summary>
+        <returns>The newly instantiated Activity object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#newActivity(java.lang.Class,%20android.content.Context,%20android.os.IBinder,%20android.app.Application,%20android.content.Intent,%20android.content.pm.ActivityInfo,%20java.lang.CharSequence,%20android.app.Activity,%20java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.newActivity(java.lang.Class, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#newActivity(java.lang.ClassLoader,%20java.lang.String,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
@@ -1795,15 +1782,14 @@
       <Docs>
         <param name="cl">The ClassLoader with which to instantiate the object.</param>
         <param name="className">The name of the class implementing the Application
-                  object.</param>
-        <param name="clazz">The class used to create an Application object from.</param>
+                             object.</param>
         <param name="context">The context to initialize the application with</param>
         <summary>Perform instantiation of the process's <c>Application</c> object.</summary>
         <returns>The newly instantiated Application object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#newApplication(java.lang.Class,%20android.content.Context)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.newApplication(java.lang.Class, android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#newApplication(java.lang.ClassLoader,%20java.lang.String,%20android.content.Context)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.newApplication(java.lang.ClassLoader, java.lang.String, android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -2692,14 +2678,17 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">To be added.</param>
         <param name="intent">Description of the activity to start.</param>
+        <param name="options">Additional options for how the Activity should be started.
+            May be null if there are no options.  See <c>android.app.ActivityOptions</c>
+            for how to build the Bundle supplied here; there are no supported definitions
+            for building it manually.</param>
         <summary>Start a new activity and wait for it to begin running before returning.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Instrumentation#startActivitySync(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.startActivitySync(android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Instrumentation#startActivitySync(android.content.Intent,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.Instrumentation.startActivitySync(android.content.Intent, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/Notification.xml b/docs/Mono.Android/en/Android.App/Notification.xml
index f2e66b5978..c82788cf26 100644
--- a/docs/Mono.Android/en/Android.App/Notification.xml
+++ b/docs/Mono.Android/en/Android.App/Notification.xml
@@ -102,11 +102,11 @@
       </Parameters>
       <Docs>
         <param name="parcel">The Parcel containing notification information.</param>
-        <summary>Constructs a Notification object with default values.</summary>
+        <summary>Unflatten the notification from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Notification#Notification()" title="Reference documentation">Java documentation for <code>android.app.Notification.Notification()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Notification#Notification(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.app.Notification.Notification(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -214,13 +214,16 @@
       </Parameters>
       <Docs>
         <param name="icon">The resource id of the icon to put in the status bar.</param>
-        <param name="tickerText">The text that flows by in the status bar when the notification first activates.</param>
-        <param name="when">The time to show in the time field, in the <c>System.currentTimeMillis</c> timebase.</param>
-        <summary>Constructs a Notification object with default values.</summary>
+        <param name="tickerText">The text that flows by in the status bar when the notification first
+                                 activates.</param>
+        <param name="when">The time to show in the time field.  In the System.currentTimeMillis
+                                 timebase.</param>
+        <summary>Constructs a Notification object with the information needed to
+            have a status bar icon without the standard expanded view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Notification#Notification()" title="Reference documentation">Java documentation for <code>android.app.Notification.Notification()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Notification#Notification(int,%20java.lang.CharSequence,%20long)" title="Reference documentation">Java documentation for <code>android.app.Notification.Notification(int, java.lang.CharSequence, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/NotificationChannel.xml b/docs/Mono.Android/en/Android.App/NotificationChannel.xml
index e5fd804e90..0705827c48 100644
--- a/docs/Mono.Android/en/Android.App/NotificationChannel.xml
+++ b/docs/Mono.Android/en/Android.App/NotificationChannel.xml
@@ -75,12 +75,26 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="id">To be added.</param>
-        <param name="name">To be added.</param>
-        <param name="importance">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="id">The id of the channel. Must be unique per package. The value may be truncated if
+                      it is too long.</param>
+        <param name="name">The user visible name of the channel. You can rename this channel when the system
+                        locale changes by listening for the <c>Intent#ACTION_LOCALE_CHANGED</c>
+                        broadcast. The recommended maximum length is 40 characters; the value may be
+                        truncated if it is too long.</param>
+        <param name="importance">The importance of the channel. This controls how interruptive notifications
+                              posted to this channel are.</param>
+        <summary>Creates a notification channel.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/NotificationChannel#NotificationChannel(java.lang.String,%20java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.app.NotificationChannel.NotificationChannel(java.lang.String, java.lang.CharSequence, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1387,8 +1401,19 @@
       </Parameters>
       <Docs>
         <param name="allowBubbles">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <summary>As of Android 11 this value is no longer respected.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/NotificationChannel#setAllowBubbles(boolean)" title="Reference documentation">Java documentation for <code>android.app.NotificationChannel.setAllowBubbles(boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="SetBypassDnd">
diff --git a/docs/Mono.Android/en/Android.App/NotificationChannelGroup.xml b/docs/Mono.Android/en/Android.App/NotificationChannelGroup.xml
index 90b1f4ab0f..44c31cc71a 100644
--- a/docs/Mono.Android/en/Android.App/NotificationChannelGroup.xml
+++ b/docs/Mono.Android/en/Android.App/NotificationChannelGroup.xml
@@ -67,11 +67,24 @@
         <Parameter Name="name" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="id">To be added.</param>
-        <param name="name">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="id">The id of the group. Must be unique per package.  the value may be truncated if
+                      it is too long.</param>
+        <param name="name">The user visible name of the group. You can rename this group when the system
+                        locale changes by listening for the <c>Intent#ACTION_LOCALE_CHANGED</c>
+                        broadcast. &lt;p&gt;The recommended maximum length is 40 characters; the value may be
+                        truncated if it is too long.</param>
+        <summary>Creates a notification channel group.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/NotificationChannelGroup#NotificationChannelGroup(java.lang.String,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.NotificationChannelGroup.NotificationChannelGroup(java.lang.String, java.lang.CharSequence)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.App/NotificationManager.xml b/docs/Mono.Android/en/Android.App/NotificationManager.xml
index 84ed3bd824..91bd359788 100644
--- a/docs/Mono.Android/en/Android.App/NotificationManager.xml
+++ b/docs/Mono.Android/en/Android.App/NotificationManager.xml
@@ -958,7 +958,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/NotificationManager#cancel(int)" title="Reference documentation">Java documentation for <code>android.app.NotificationManager.cancel(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/NotificationManager#cancel(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.app.NotificationManager.cancel(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1789,12 +1789,13 @@
       <Docs>
         <param name="channelId">To be added.</param>
         <param name="conversationId">To be added.</param>
-        <summary>Returns the notification channel settings for a given channel id.</summary>
+        <summary>Returns the notification channel settings for a given channel and
+            <c>ShortcutInfo#getId() conversation id</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/NotificationManager#getNotificationChannel(java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.NotificationManager.getNotificationChannel(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/NotificationManager#getNotificationChannel(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.NotificationManager.getNotificationChannel(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2478,7 +2479,6 @@
         <ReturnType>Android.App.NotificationManager+Policy</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="policy">The new desired policy.</param>
         <summary>Gets the current user-specified default notification policy. -or- Sets the current notification policy.</summary>
         <value>To be added.</value>
         <remarks>
@@ -2572,15 +2572,15 @@
       </Parameters>
       <Docs>
         <param name="tag">A string identifier for this notification.  May be <c>null</c>.</param>
-        <param name="id">An identifier for this notification unique within your
-                   application.</param>
-        <param name="notification">A <c>Notification</c> object describing what to show the user. Must not
-                   be null.</param>
-        <summary>Post a notification to be shown in the status bar.</summary>
+        <param name="id">An identifier for this notification.  The pair (tag, id) must be unique
+                   within your application.</param>
+        <param name="notification">A <c>Notification</c> object describing what to
+                   show the user. Must not be null.</param>
+        <summary>Posts a notification to be shown in the status bar.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/NotificationManager#notify(int,%20android.app.Notification)" title="Reference documentation">Java documentation for <code>android.app.NotificationManager.notify(int, android.app.Notification)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/NotificationManager#notify(java.lang.String,%20int,%20android.app.Notification)" title="Reference documentation">Java documentation for <code>android.app.NotificationManager.notify(java.lang.String, int, android.app.Notification)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/PendingIntent.xml b/docs/Mono.Android/en/Android.App/PendingIntent.xml
index d6612fe1bb..a8c26eebfa 100644
--- a/docs/Mono.Android/en/Android.App/PendingIntent.xml
+++ b/docs/Mono.Android/en/Android.App/PendingIntent.xml
@@ -399,7 +399,7 @@
         <param name="intents">Array of Intents of the activities to be launched.</param>
         <param name="flags">May be <c>#FLAG_ONE_SHOT</c>, <c>#FLAG_NO_CREATE</c>,
             <c>#FLAG_CANCEL_CURRENT</c>, <c>#FLAG_UPDATE_CURRENT</c>,
-            or any of the flags as supported by
+            <c>#FLAG_IMMUTABLE</c> or any of the flags as supported by
             <c>Intent#fillIn Intent.fillIn()</c> to control which unspecified parts
             of the intent that can be supplied when the actual send happens.</param>
         <summary>Like <c>#getActivity(Context, int, Intent, int)</c>, but allows an
@@ -410,7 +410,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/PendingIntent#getActivities(android.content.Context,%20int,%20android.content.Intent[],%20int)" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.getActivities(android.content.Context, int, android.content.Intent[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/PendingIntent#getActivities(android.content.Context,%20int,%20android.content.Intent[],%20int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.getActivities(android.content.Context, int, android.content.Intent[], int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -518,8 +518,6 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- May be null if there are no options.</param>
         <param name="context">The Context in which this PendingIntent should start
             the activity.</param>
         <param name="requestCode">Private request code for the sender</param>
@@ -529,6 +527,8 @@
             or any of the flags as supported by
             <c>Intent#fillIn Intent.fillIn()</c> to control which unspecified parts
             of the intent that can be supplied when the actual send happens.</param>
+        <param name="options">Additional options for how the Activity should be started.
+            May be null if there are no options.</param>
         <summary>Retrieve a PendingIntent that will start a new activity, like calling
             <c>Context#startActivity(Intent) Context.startActivity(Intent)</c>.</summary>
         <returns>Returns an existing or new PendingIntent matching the given
@@ -537,7 +537,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/PendingIntent#getActivity(android.content.Context,%20int,%20android.content.Intent,%20int)" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.getActivity(android.content.Context, int, android.content.Intent, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/PendingIntent#getActivity(android.content.Context,%20int,%20android.content.Intent,%20int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.getActivity(android.content.Context, int, android.content.Intent, int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1105,7 +1105,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/PendingIntent#send()" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.send()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/PendingIntent#send(int)" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.send(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1213,14 +1213,16 @@
       <Docs>
         <param name="context">The Context of the caller.</param>
         <param name="code">Result code to supply back to the PendingIntent's target.</param>
-        <param name="intent">Additional Intent data.  See <see cref="M:Android.Content.Intent.FillIn(Android.Content.Intent,Android.Content.FillInFlags)" /> for information on how this is applied to the
- original Intent. If flag <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android App PendingIntent FLAG_IMMUTABLE';scope=Xamarin" title="Android.App.PendingIntent.FLAG_IMMUTABLE">Android.App.PendingIntent.FLAG_IMMUTABLE</a></format> was set when this
- pending intent was created, this argument will be ignored.</param>
-        <summary>Perform the operation associated with this PendingIntent.</summary>
+        <param name="intent">Additional Intent data.  See <c>Intent#fillIn
+            Intent.fillIn()</c> for information on how this is applied to the
+            original Intent. If flag <c>#FLAG_IMMUTABLE</c> was set when this
+            pending intent was created, this argument will be ignored.</param>
+        <summary>Perform the operation associated with this PendingIntent, allowing the
+            caller to specify information about the Intent to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/PendingIntent#send()" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.send()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/PendingIntent#send(android.content.Context,%20int,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.app.PendingIntent.send(android.content.Context, int, android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/Presentation.xml b/docs/Mono.Android/en/Android.App/Presentation.xml
index 35ddf8c814..6f5a8086c3 100644
--- a/docs/Mono.Android/en/Android.App/Presentation.xml
+++ b/docs/Mono.Android/en/Android.App/Presentation.xml
@@ -117,17 +117,26 @@
         <Parameter Name="theme" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="theme">To be added.</param>
         <param name="outerContext">The context of the application that is showing the presentation.
             The presentation will create its own context (see <c>#getContext()</c>) based
-            on this context and information about the associated display.</param>
+            on this context and information about the associated display.
+            From <c>android.os.Build.VERSION_CODES#S</c>, the presentation will create its own window
+            context based on this context, information about the associated display. Customizing window
+            type by <c>Window#setType(int) #getWindow#setType(int)</c> causes the mismatch of the window
+            and the created window context, which leads to
+            <c>android.view.WindowManager.InvalidDisplayException</c> when invoking <c>#show()</c>.</param>
         <param name="display">The display to which the presentation should be attached.</param>
+        <param name="theme">A style resource describing the theme to use for the window.
+            See &lt;a href="[TODO: @docRoot]guide/topics/resources/available-resources.html#stylesandthemes"&gt;
+            Style and Theme Resources&lt;/a&gt; for more information about defining and using
+            styles.  This theme is applied on top of the current theme in
+            &lt;var&gt;outerContext&lt;/var&gt;.  If 0, the default presentation theme will be used.</param>
         <summary>Creates a new presentation that is attached to the specified display
-            using the default theme.</summary>
+            using the optionally specified theme.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Presentation#Presentation(android.content.Context,%20android.view.Display)" title="Reference documentation">Java documentation for <code>android.app.Presentation.Presentation(android.content.Context, android.view.Display)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Presentation#Presentation(android.content.Context,%20android.view.Display,%20int)" title="Reference documentation">Java documentation for <code>android.app.Presentation.Presentation(android.content.Context, android.view.Display, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/ProgressDialog.xml b/docs/Mono.Android/en/Android.App/ProgressDialog.xml
index 757a264c36..ccb86c0dc2 100644
--- a/docs/Mono.Android/en/Android.App/ProgressDialog.xml
+++ b/docs/Mono.Android/en/Android.App/ProgressDialog.xml
@@ -104,13 +104,15 @@
         <Parameter Name="theme" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="theme">To be added.</param>
         <param name="context">the parent context</param>
+        <param name="theme">the resource ID of the theme against which to inflate
+                         this dialog, or <c>0</c> to use the parent
+                         <c>context</c>'s default alert dialog theme</param>
         <summary>Creates a Progress dialog.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ProgressDialog#ProgressDialog(android.content.Context)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.ProgressDialog(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ProgressDialog#ProgressDialog(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.ProgressDialog(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -866,16 +868,17 @@
         <Parameter Name="indeterminate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="indeterminate">To be added.</param>
         <param name="context">the parent context</param>
         <param name="title">the title text for the dialog's window</param>
         <param name="message">the text to be displayed in the dialog</param>
+        <param name="indeterminate">true if the dialog should be <c>#setIndeterminate(boolean)
+                   indeterminate</c>, false otherwise</param>
         <summary>Creates and shows a ProgressDialog.</summary>
         <returns>the ProgressDialog</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -913,16 +916,17 @@
         <Parameter Name="indeterminate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="indeterminate">To be added.</param>
         <param name="context">the parent context</param>
         <param name="title">the title text for the dialog's window</param>
         <param name="message">the text to be displayed in the dialog</param>
+        <param name="indeterminate">true if the dialog should be <c>#setIndeterminate(boolean)
+                   indeterminate</c>, false otherwise</param>
         <summary>Creates and shows a ProgressDialog.</summary>
         <returns>the ProgressDialog</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -964,17 +968,19 @@
         <Parameter Name="cancelable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="indeterminate">To be added.</param>
-        <param name="cancelable">To be added.</param>
         <param name="context">the parent context</param>
         <param name="title">the title text for the dialog's window</param>
         <param name="message">the text to be displayed in the dialog</param>
+        <param name="indeterminate">true if the dialog should be <c>#setIndeterminate(boolean)
+                   indeterminate</c>, false otherwise</param>
+        <param name="cancelable">true if the dialog is <c>#setCancelable(boolean) cancelable</c>,
+                   false otherwise</param>
         <summary>Creates and shows a ProgressDialog.</summary>
         <returns>the ProgressDialog</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1013,17 +1019,19 @@
         <Parameter Name="cancelable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="indeterminate">To be added.</param>
-        <param name="cancelable">To be added.</param>
         <param name="context">the parent context</param>
         <param name="title">the title text for the dialog's window</param>
         <param name="message">the text to be displayed in the dialog</param>
+        <param name="indeterminate">true if the dialog should be <c>#setIndeterminate(boolean)
+                   indeterminate</c>, false otherwise</param>
+        <param name="cancelable">true if the dialog is <c>#setCancelable(boolean) cancelable</c>,
+                   false otherwise</param>
         <summary>Creates and shows a ProgressDialog.</summary>
         <returns>the ProgressDialog</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/ProgressDialog#show(android.content.Context,%20java.lang.CharSequence,%20java.lang.CharSequence,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.ProgressDialog.show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1066,12 +1074,12 @@
         <Parameter Name="cancelListener" Type="Android.Content.IDialogInterfaceOnCancelListener" />
       </Parameters>
       <Docs>
-        <param name="indeterminate">To be added.</param>
-        <param name="cancelable">To be added.</param>
-        <param name="cancelListener">To be added.</param>
         <param name="context">the parent context</param>
         <param name="title">the title text for the dialog's window</param>
         <param name="message">the text to be displayed in the dialog</param>
+        <param name="indeterminate">To be added.</param>
+        <param name="cancelable">To be added.</param>
+        <param name="cancelListener">To be added.</param>
         <summary>Creates and shows a ProgressDialog.</summary>
         <returns>the ProgressDialog</returns>
         <remarks>
@@ -1152,12 +1160,12 @@
         <Parameter Name="cancelListener" Type="Android.Content.IDialogInterfaceOnCancelListener" />
       </Parameters>
       <Docs>
-        <param name="indeterminate">To be added.</param>
-        <param name="cancelable">To be added.</param>
-        <param name="cancelListener">To be added.</param>
         <param name="context">the parent context</param>
         <param name="title">the title text for the dialog's window</param>
         <param name="message">the text to be displayed in the dialog</param>
+        <param name="indeterminate">To be added.</param>
+        <param name="cancelable">To be added.</param>
+        <param name="cancelListener">To be added.</param>
         <summary>Creates and shows a ProgressDialog.</summary>
         <returns>the ProgressDialog</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.App/RecoverableSecurityException.xml b/docs/Mono.Android/en/Android.App/RecoverableSecurityException.xml
index 66e15351db..afdaa5b835 100644
--- a/docs/Mono.Android/en/Android.App/RecoverableSecurityException.xml
+++ b/docs/Mono.Android/en/Android.App/RecoverableSecurityException.xml
@@ -69,11 +69,33 @@
         <Parameter Name="userAction" Type="Android.App.RemoteAction" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="userMessage">To be added.</param>
-        <param name="userAction">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="cause">original cause with details designed for engineering
+                       audiences.</param>
+        <param name="userMessage">short message describing the issue for end user
+                       audiences, which may be shown in a notification or dialog.
+                       This should be localized and less than 64 characters. For
+                       example: &lt;em&gt;PIN required to access Document.pdf&lt;/em&gt;</param>
+        <param name="userAction">primary action that will initiate the recovery. The
+                       title should be localized and less than 24 characters. For
+                       example: &lt;em&gt;Enter PIN&lt;/em&gt;. This action must launch an
+                       activity that is expected to set
+                       <c>Activity#setResult(int)</c> before finishing to
+                       communicate the final status of the recovery. For example,
+                       apps that observe <c>Activity#RESULT_OK</c> may choose to
+                       immediately retry their operation.</param>
+        <summary>Create an instance ready to be thrown.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/RecoverableSecurityException#RecoverableSecurityException(java.lang.Throwable,%20java.lang.CharSequence,%20android.app.RemoteAction)" title="Reference documentation">Java documentation for <code>android.app.RecoverableSecurityException.RecoverableSecurityException(java.lang.Throwable, java.lang.CharSequence, android.app.RemoteAction)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/docs/Mono.Android/en/Android.App/Service.xml b/docs/Mono.Android/en/Android.App/Service.xml
index 370f8e41cd..44e91f09c9 100644
--- a/docs/Mono.Android/en/Android.App/Service.xml
+++ b/docs/Mono.Android/en/Android.App/Service.xml
@@ -840,18 +840,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="foregroundServiceType">To be added.</param>
         <param name="id">The identifier for this notification as per
             <c>NotificationManager#notify(int, Notification)
             NotificationManager.notify(int, Notification)</c>; must not be 0.</param>
         <param name="notification">The Notification to be displayed.</param>
-        <summary>If your service is started (running through <c>Context#startService(Intent)</c>), then
-            also make this service run in the foreground, supplying the ongoing
-            notification to be shown to the user while in this state.</summary>
+        <param name="foregroundServiceType">must be a subset flags of manifest attribute
+            <c>android.R.attr#foregroundServiceType</c> flags.</param>
+        <summary>An overloaded version of <c>#startForeground(int, Notification)</c> with additional
+            foregroundServiceType parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Service#startForeground(int,%20android.app.Notification)" title="Reference documentation">Java documentation for <code>android.app.Service.startForeground(int, android.app.Notification)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Service#startForeground(int,%20android.app.Notification,%20int)" title="Reference documentation">Java documentation for <code>android.app.Service.startForeground(int, android.app.Notification, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -932,16 +932,13 @@
         <Parameter Name="removeNotification" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="removeNotification">If true, the notification previously provided
- to <see cref="M:Android.App.Service.StartForeground(System.Int32,Android.App.Notification)" /> will be removed.  Otherwise it will remain
- until a later call removes it (or the service is destroyed).</param>
-        <param name="flags">additional behavior options.</param>
-        <summary>Remove this service from foreground state, allowing it to be killed if
-            more memory is needed.</summary>
+        <param name="removeNotification">If true, the <c>#STOP_FOREGROUND_REMOVE</c> flag
+            will be supplied.</param>
+        <summary>Synonym for <c>#stopForeground(int)</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Service#stopForeground(int)" title="Reference documentation">Java documentation for <code>android.app.Service.stopForeground(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Service#stopForeground(boolean)" title="Reference documentation">Java documentation for <code>android.app.Service.stopForeground(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1098,11 +1095,11 @@
       </Parameters>
       <Docs>
         <param name="startId">To be added.</param>
-        <summary>Stop the service, if it was previously started.</summary>
+        <summary>Old version of <c>#stopSelfResult</c> that doesn't return a result.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/Service#stopSelf()" title="Reference documentation">Java documentation for <code>android.app.Service.stopSelf()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/Service#stopSelf(int)" title="Reference documentation">Java documentation for <code>android.app.Service.stopSelf(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/SyncNotedAppOp.xml b/docs/Mono.Android/en/Android.App/SyncNotedAppOp.xml
index f3cd644841..76b7e28430 100644
--- a/docs/Mono.Android/en/Android.App/SyncNotedAppOp.xml
+++ b/docs/Mono.Android/en/Android.App/SyncNotedAppOp.xml
@@ -67,10 +67,21 @@
         <Parameter Name="attributionTag" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="opCode">To be added.</param>
-        <param name="attributionTag">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="opCode">op code of synchronous appop noted</param>
+        <param name="attributionTag">attributionTag of synchronous appop noted</param>
+        <summary>Creates a new SyncNotedAppOp.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/app/SyncNotedAppOp#SyncNotedAppOp(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.SyncNotedAppOp.SyncNotedAppOp(int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="AttributionTag">
diff --git a/docs/Mono.Android/en/Android.App/TabActivity.xml b/docs/Mono.Android/en/Android.App/TabActivity.xml
index 3ae8fadac7..f8e85dc423 100644
--- a/docs/Mono.Android/en/Android.App/TabActivity.xml
+++ b/docs/Mono.Android/en/Android.App/TabActivity.xml
@@ -195,14 +195,12 @@
         <Parameter Name="tag" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="tag">the name of the default tab
-</param>
-        <param name="index">the index of the default tab</param>
+        <param name="tag">the name of the default tab</param>
         <summary>Sets the default tab that is the first tab highlighted.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/TabActivity#setDefaultTab(int)" title="Reference documentation">Java documentation for <code>android.app.TabActivity.setDefaultTab(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/TabActivity#setDefaultTab(java.lang.String)" title="Reference documentation">Java documentation for <code>android.app.TabActivity.setDefaultTab(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/TaskStackBuilder.xml b/docs/Mono.Android/en/Android.App/TaskStackBuilder.xml
index 86d7462aae..7301e6917a 100644
--- a/docs/Mono.Android/en/Android.App/TaskStackBuilder.xml
+++ b/docs/Mono.Android/en/Android.App/TaskStackBuilder.xml
@@ -211,18 +211,15 @@
       </Parameters>
       <Docs>
         <param name="sourceActivityName">Must specify an Activity component. All parents of
-                           this activity will be added</param>
-        <param name="sourceActivity">All parents of this activity will be added</param>
+                                      this activity will be added</param>
         <summary>Add the activity parent chain as specified by the
-            <c>Activity#getParentActivityIntent() getParentActivityIntent()</c> method of the activity
-            specified and the <c>android.R.attr#parentActivityName parentActivityName</c> attributes
-            of each successive activity (or activity-alias) element in the application's manifest
-            to the task stack builder.</summary>
+            <c>android.R.attr#parentActivityName parentActivityName</c> attribute of the activity
+            (or activity-alias) element in the application's manifest to the task stack builder.</summary>
         <returns>This TaskStackBuilder for method chaining</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/TaskStackBuilder#addParentStack(android.app.Activity)" title="Reference documentation">Java documentation for <code>android.app.TaskStackBuilder.addParentStack(android.app.Activity)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/TaskStackBuilder#addParentStack(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.app.TaskStackBuilder.addParentStack(android.content.ComponentName)</code>.</a>
             </format>
           </para>
           <para>
@@ -257,18 +254,15 @@
         <Parameter Name="sourceActivityClass" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="sourceActivityClass">To be added.</param>
-        <param name="sourceActivity">All parents of this activity will be added</param>
+        <param name="sourceActivityClass">All parents of this activity will be added</param>
         <summary>Add the activity parent chain as specified by the
-            <c>Activity#getParentActivityIntent() getParentActivityIntent()</c> method of the activity
-            specified and the <c>android.R.attr#parentActivityName parentActivityName</c> attributes
-            of each successive activity (or activity-alias) element in the application's manifest
-            to the task stack builder.</summary>
+            <c>android.R.attr#parentActivityName parentActivityName</c> attribute of the activity
+            (or activity-alias) element in the application's manifest to the task stack builder.</summary>
         <returns>This TaskStackBuilder for method chaining</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/TaskStackBuilder#addParentStack(android.app.Activity)" title="Reference documentation">Java documentation for <code>android.app.TaskStackBuilder.addParentStack(android.app.Activity)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/TaskStackBuilder#addParentStack(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.app.TaskStackBuilder.addParentStack(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -486,14 +480,14 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <param name="requestCode">Private request code for the sender</param>
         <param name="flags">May be <c>PendingIntent#FLAG_ONE_SHOT</c>,
                          <c>PendingIntent#FLAG_NO_CREATE</c>, <c>PendingIntent#FLAG_CANCEL_CURRENT</c>,
                          <c>PendingIntent#FLAG_UPDATE_CURRENT</c>, or any of the flags supported by
                          <c>Intent#fillIn(Intent, int)</c> to control which unspecified parts of the
                          intent that can be supplied when the actual send happens.</param>
+        <param name="options">Additional options for how the Activity should be started.
+ See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
         <summary>Obtain a <c>PendingIntent</c> for launching the task constructed by this builder so far.</summary>
         <returns>The obtained PendingIntent</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.App/TimePickerDialog.xml b/docs/Mono.Android/en/Android.App/TimePickerDialog.xml
index 18a29f0821..6fb7cab205 100644
--- a/docs/Mono.Android/en/Android.App/TimePickerDialog.xml
+++ b/docs/Mono.Android/en/Android.App/TimePickerDialog.xml
@@ -99,7 +99,6 @@
       </Parameters>
       <Docs>
         <param name="context">the parent context</param>
-        <param name="themeResId">the resource ID of the theme to apply to this dialog</param>
         <param name="listener">the listener to call when the time is set</param>
         <param name="hourOfDay">the initial hour</param>
         <param name="minute">the initial minute</param>
diff --git a/docs/Mono.Android/en/Android.App/VoiceInteractor.xml b/docs/Mono.Android/en/Android.App/VoiceInteractor.xml
index 9b3dcc5c87..caab0c39aa 100644
--- a/docs/Mono.Android/en/Android.App/VoiceInteractor.xml
+++ b/docs/Mono.Android/en/Android.App/VoiceInteractor.xml
@@ -281,8 +281,6 @@
       </Parameters>
       <Docs>
         <param name="request">The desired request to submit.</param>
-        <param name="name">An optional name for this request, or null. This can be used later with
-            <c>#getActiveRequests</c> and <c>#getActiveRequest</c> to find the request.</param>
         <summary>Submit a new <c>Request</c> to the voice interaction service.</summary>
         <returns>Returns true of the request was successfully submitted, else false.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.App/WallpaperColors.xml b/docs/Mono.Android/en/Android.App/WallpaperColors.xml
index 29eff6fe29..3d106c3886 100644
--- a/docs/Mono.Android/en/Android.App/WallpaperColors.xml
+++ b/docs/Mono.Android/en/Android.App/WallpaperColors.xml
@@ -67,9 +67,6 @@
       </Parameters>
       <Docs>
         <param name="parcel">To be added.</param>
-        <param name="primaryColor">Primary color.</param>
-        <param name="secondaryColor">Secondary color.</param>
-        <param name="tertiaryColor">Tertiary color.</param>
         <summary>Constructs a new object from three colors.</summary>
         <remarks>
           <para>
@@ -155,15 +152,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="colorHints">To be added.</param>
         <param name="primaryColor">Primary color.</param>
         <param name="secondaryColor">Secondary color.</param>
         <param name="tertiaryColor">Tertiary color.</param>
-        <summary>Constructs a new object from three colors.</summary>
+        <param name="colorHints">A combination of color hints.</param>
+        <summary>Constructs a new object from three colors, where hints can be specified.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/WallpaperColors#WallpaperColors(android.graphics.Color,%20android.graphics.Color,%20android.graphics.Color)" title="Reference documentation">Java documentation for <code>android.app.WallpaperColors.WallpaperColors(android.graphics.Color, android.graphics.Color, android.graphics.Color)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/WallpaperColors#WallpaperColors(android.graphics.Color,%20android.graphics.Color,%20android.graphics.Color,%20int)" title="Reference documentation">Java documentation for <code>android.app.WallpaperColors.WallpaperColors(android.graphics.Color, android.graphics.Color, android.graphics.Color, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.App/WallpaperManager.xml b/docs/Mono.Android/en/Android.App/WallpaperManager.xml
index 40bdcb9395..cf27cb2cf3 100644
--- a/docs/Mono.Android/en/Android.App/WallpaperManager.xml
+++ b/docs/Mono.Android/en/Android.App/WallpaperManager.xml
@@ -313,13 +313,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="which">To be added.</param>
-        <summary>Remove any currently set system wallpaper, reverting to the system's built-in
-            wallpaper.</summary>
+        <param name="which">A bitwise combination of <c>#FLAG_SYSTEM</c> or
+              <c>#FLAG_LOCK</c></param>
+        <summary>Remove one or more currently set wallpapers, reverting to the system default
+            display for each one.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/WallpaperManager#clear()" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.clear()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/WallpaperManager#clear(int)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.clear(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -871,13 +872,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="which">To be added.</param>
-        <summary>Obtain a drawable for the built-in static system wallpaper.</summary>
-        <returns>To be added.</returns>
+        <param name="which">The <c>FLAG_*</c> identifier of a valid wallpaper type.  Throws
+                IllegalArgumentException if an invalid wallpaper is requested.</param>
+        <summary>Obtain a drawable for the specified built-in static system wallpaper.</summary>
+        <returns>A Drawable presenting the specified wallpaper image, or <c>null</c>
+                if no built-in default image for that wallpaper type exists.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/WallpaperManager#getBuiltInDrawable()" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.getBuiltInDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/WallpaperManager#getBuiltInDrawable(int)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.getBuiltInDrawable(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -915,21 +918,20 @@
         <Parameter Name="verticalAlignment" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="outWidth">The height of the returned drawable</param>
         <param name="outHeight">To be added.</param>
+        <param name="outWidth">The height of the returned drawable</param>
         <param name="scaleToFit">If true, scale the wallpaper down rather than just cropping it</param>
         <param name="horizontalAlignment">A float value between 0 and 1 specifying where to crop the image;
-        0 for left-aligned, 0.5 for horizontal center-aligned, and 1 for right-aligned</param>
+                   0 for left-aligned, 0.5 for horizontal center-aligned, and 1 for right-aligned</param>
         <param name="verticalAlignment">A float value between 0 and 1 specifying where to crop the image;
-        0 for top-aligned, 0.5 for vertical center-aligned, and 1 for bottom-aligned
-
-</param>
-        <summary>Obtain a drawable for the built-in static system wallpaper.</summary>
-        <returns>To be added.</returns>
+                   0 for top-aligned, 0.5 for vertical center-aligned, and 1 for bottom-aligned</param>
+        <summary>Returns a drawable for the system built-in static wallpaper.</summary>
+        <returns>A Drawable presenting the built-in default system wallpaper image,
+                   or <c>null</c> if no such default image is defined on this device.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/WallpaperManager#getBuiltInDrawable()" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.getBuiltInDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/WallpaperManager#getBuiltInDrawable(int,%20int,%20boolean,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.getBuiltInDrawable(int, int, boolean, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -975,18 +977,22 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="outWidth">To be added.</param>
         <param name="outHeight">To be added.</param>
-        <param name="scaleToFit">To be added.</param>
-        <param name="horizontalAlignment">To be added.</param>
-        <param name="verticalAlignment">To be added.</param>
-        <param name="which">To be added.</param>
-        <summary>Obtain a drawable for the built-in static system wallpaper.</summary>
-        <returns>To be added.</returns>
+        <param name="outWidth">The height of the returned drawable</param>
+        <param name="scaleToFit">If true, scale the wallpaper down rather than just cropping it</param>
+        <param name="horizontalAlignment">A float value between 0 and 1 specifying where to crop the image;
+                   0 for left-aligned, 0.5 for horizontal center-aligned, and 1 for right-aligned</param>
+        <param name="verticalAlignment">A float value between 0 and 1 specifying where to crop the image;
+                   0 for top-aligned, 0.5 for vertical center-aligned, and 1 for bottom-aligned</param>
+        <param name="which">The <c>FLAG_*</c> identifier of a valid wallpaper type.  Throws
+                IllegalArgumentException if an invalid wallpaper is requested.</param>
+        <summary>Returns a drawable for the built-in static wallpaper of the specified type.</summary>
+        <returns>A Drawable presenting the built-in default wallpaper image of the given type,
+                   or <c>null</c> if no default image of that type is defined on this device.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/WallpaperManager#getBuiltInDrawable()" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.getBuiltInDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/WallpaperManager#getBuiltInDrawable(int,%20int,%20boolean,%20float,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.getBuiltInDrawable(int, int, boolean, float, float, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1617,16 +1623,21 @@
         <Parameter Name="allowBackup" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fullImage">To be added.</param>
-        <param name="visibleCropHint">To be added.</param>
-        <param name="allowBackup">To be added.</param>
-        <param name="bitmap">The bitmap to be used as the new system wallpaper.</param>
-        <summary>Change the current system wallpaper to a bitmap.</summary>
-        <returns>To be added.</returns>
+        <param name="fullImage">A bitmap that will supply the wallpaper imagery.</param>
+        <param name="visibleCropHint">The rectangular subregion of <c>fullImage</c> that should be
+                displayed as wallpaper.  Passing <c>null</c> for this parameter means that
+                the full image should be displayed if possible given the image's and device's
+                aspect ratios, etc.</param>
+        <param name="allowBackup">
+          <c>true</c> if the OS is permitted to back up this wallpaper
+                image for restore to a future device; <c>false</c> otherwise.</param>
+        <summary>Change the current system wallpaper to a bitmap, specifying a hint about
+            which subrectangle of the full image is to be visible.</summary>
+        <returns>An integer ID assigned to the newly active wallpaper; or zero on failure.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/WallpaperManager#setBitmap(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.setBitmap(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/WallpaperManager#setBitmap(android.graphics.Bitmap,%20android.graphics.Rect,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.setBitmap(android.graphics.Bitmap, android.graphics.Rect, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1678,7 +1689,6 @@
         <param name="visibleCropHint">To be added.</param>
         <param name="allowBackup">To be added.</param>
         <param name="which">To be added.</param>
-        <param name="bitmap">The bitmap to be used as the new system wallpaper.</param>
         <summary>Change the current system wallpaper to a bitmap.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -1821,8 +1831,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="which">To be added.</param>
         <param name="resid">The resource ID of the bitmap to be used as the wallpaper image</param>
+        <param name="which">To be added.</param>
         <summary>Change the current system wallpaper to the bitmap in the given resource.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -1916,16 +1926,22 @@
         <Parameter Name="allowBackup" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="visibleCropHint">To be added.</param>
-        <param name="allowBackup">To be added.</param>
         <param name="bitmapData">A stream containing the raw data to install as a wallpaper.  This
                 data can be in any format handled by <c>BitmapRegionDecoder</c>.</param>
-        <summary>Change the current system wallpaper to a specific byte stream.</summary>
-        <returns>To be added.</returns>
+        <param name="visibleCropHint">The rectangular subregion of the streamed image that should be
+                displayed as wallpaper.  Passing <c>null</c> for this parameter means that
+                the full image should be displayed if possible given the image's and device's
+                aspect ratios, etc.</param>
+        <param name="allowBackup">
+          <c>true</c> if the OS is permitted to back up this wallpaper
+                image for restore to a future device; <c>false</c> otherwise.</param>
+        <summary>Change the current system wallpaper to a specific byte stream, specifying a
+            hint about which subrectangle of the full image is to be visible.</summary>
+        <returns>An integer ID assigned to the newly active wallpaper; or zero on failure.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/app/WallpaperManager#setStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.setStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/android/app/WallpaperManager#setStream(java.io.InputStream,%20android.graphics.Rect,%20boolean)" title="Reference documentation">Java documentation for <code>android.app.WallpaperManager.setStream(java.io.InputStream, android.graphics.Rect, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1973,11 +1989,11 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="bitmapData">A stream containing the raw data to install as a wallpaper.  This
+                data can be in any format handled by <c>BitmapRegionDecoder</c>.</param>
         <param name="visibleCropHint">To be added.</param>
         <param name="allowBackup">To be added.</param>
         <param name="which">To be added.</param>
-        <param name="bitmapData">A stream containing the raw data to install as a wallpaper.  This
-                data can be in any format handled by <c>BitmapRegionDecoder</c>.</param>
         <summary>Change the current system wallpaper to a specific byte stream.</summary>
         <returns>To be added.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Appwidget/AppWidgetHostView.xml b/docs/Mono.Android/en/Android.Appwidget/AppWidgetHostView.xml
index 471bc69152..d1de3ac011 100644
--- a/docs/Mono.Android/en/Android.Appwidget/AppWidgetHostView.xml
+++ b/docs/Mono.Android/en/Android.Appwidget/AppWidgetHostView.xml
@@ -117,13 +117,13 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
-        <param name="animationIn">To be added.</param>
-        <param name="animationOut">To be added.</param>
+        <param name="animationIn">Resource ID of in animation to use</param>
+        <param name="animationOut">Resource ID of out animation to use</param>
         <summary>Create a host view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView#AppWidgetHostView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetHostView.AppWidgetHostView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView#AppWidgetHostView(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetHostView.AppWidgetHostView(android.content.Context, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -750,18 +750,15 @@
         <Parameter Name="sizes" Type="System.Collections.Generic.IList&lt;Android.Util.SizeF&gt;" />
       </Parameters>
       <Docs>
-        <param name="sizes">To be added.</param>
-        <param name="newOptions">The bundle of options, in addition to the size information,
-                     can be null.</param>
-        <param name="minWidth">The minimum width in dips that the widget will be displayed at.</param>
-        <param name="minHeight">The maximum height in dips that the widget will be displayed at.</param>
-        <param name="maxWidth">The maximum width in dips that the widget will be displayed at.</param>
-        <param name="maxHeight">The maximum height in dips that the widget will be displayed at.</param>
+        <param name="newOptions">The bundle of options, in addition to the size information.</param>
+        <param name="sizes">Sizes, in dips, the widget may be displayed at without calling the provider
+                         again. Typically, this will be size of the widget in landscape and portrait.
+                         On some foldables, this might include the size on the outer and inner screens.</param>
         <summary>Provide guidance about the size of this widget to the AppWidgetManager.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView#updateAppWidgetSize(android.os.Bundle,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetHostView.updateAppWidgetSize(android.os.Bundle, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView#updateAppWidgetSize(android.os.Bundle,%20java.util.List)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetHostView.updateAppWidgetSize(android.os.Bundle, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Appwidget/AppWidgetManager.xml b/docs/Mono.Android/en/Android.Appwidget/AppWidgetManager.xml
index a6006ec922..62543360f9 100644
--- a/docs/Mono.Android/en/Android.Appwidget/AppWidgetManager.xml
+++ b/docs/Mono.Android/en/Android.Appwidget/AppWidgetManager.xml
@@ -530,17 +530,17 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Bundle containing options for the AppWidget. See also
-                      <see cref="M:Android.Appwidget.AppWidgetManager.UpdateAppWidgetOptions(System.Int32,Android.OS.Bundle)" /></param>
         <param name="appWidgetId">The AppWidget id under which to bind the provider.</param>
         <param name="provider">The <c>android.content.BroadcastReceiver</c> that will be the AppWidget
                                  provider for this AppWidget.</param>
+        <param name="options">Bundle containing options for the AppWidget. See also
+                                 <c>#updateAppWidgetOptions(int, Bundle)</c></param>
         <summary>Set the component for a given appWidgetId.</summary>
         <returns>true if this component has permission to bind the AppWidget</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#bindAppWidgetIdIfAllowed(int,%20android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.bindAppWidgetIdIfAllowed(int, android.content.ComponentName)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#bindAppWidgetIdIfAllowed(int,%20android.content.ComponentName,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.bindAppWidgetIdIfAllowed(int, android.content.ComponentName, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -578,17 +578,16 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
+        <param name="appWidgetId">The AppWidget id under which to bind the provider.</param>
         <param name="user">The user id in which the provider resides.</param>
+        <param name="provider">The component name of the provider.</param>
         <param name="options">An optional Bundle containing options for the AppWidget.</param>
-        <param name="appWidgetId">The AppWidget id under which to bind the provider.</param>
-        <param name="provider">The <c>android.content.BroadcastReceiver</c> that will be the AppWidget
-                                 provider for this AppWidget.</param>
-        <summary>Set the component for a given appWidgetId.</summary>
+        <summary>Set the provider for a given appWidgetId if the caller has a permission.</summary>
         <returns>true if this component has permission to bind the AppWidget</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#bindAppWidgetIdIfAllowed(int,%20android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.bindAppWidgetIdIfAllowed(int, android.content.ComponentName)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#bindAppWidgetIdIfAllowed(int,%20android.os.UserHandle,%20android.content.ComponentName,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.bindAppWidgetIdIfAllowed(int, android.os.UserHandle, android.content.ComponentName, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1121,12 +1120,21 @@
         <Parameter Name="profile" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="profile">The profile for which to get providers. Passing null is equivaled
-         to passing only the current user handle.</param>
+        <param name="profile">The profile for which to get providers. Passing null is equivalent
+                   to querying for only the calling user.</param>
         <summary>Gets the AppWidget providers for the given user profile.</summary>
-        <returns>To be added.</returns>
+        <returns>The installed providers, or an empty list if none are found for the given user.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#getInstalledProvidersForProfile(android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.getInstalledProvidersForProfile(android.os.UserHandle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <altmember cref="M:Android.OS.Process.MyUserHandle" />
         <altmember cref="P:Android.OS.UserManager.UserProfiles" />
@@ -1421,14 +1429,13 @@
       </Parameters>
       <Docs>
         <param name="appWidgetIds">The AppWidget instances to notify of view data changes.</param>
-        <param name="appWidgetId">The AppWidget instance to notify of view data changes.</param>
         <param name="viewId">The collection view id.</param>
-        <summary>Notifies the specified collection view in the specified AppWidget instance
-            to invalidate its data.</summary>
+        <summary>Notifies the specified collection view in all the specified AppWidget instances
+            to invalidate their data.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#notifyAppWidgetViewDataChanged(int,%20int)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.notifyAppWidgetViewDataChanged(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#notifyAppWidgetViewDataChanged(int[],%20int)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.notifyAppWidgetViewDataChanged(int[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1763,13 +1770,12 @@
       </Parameters>
       <Docs>
         <param name="appWidgetIds">The AppWidget instances for which to set the RemoteViews.</param>
-        <param name="appWidgetId">The AppWidget instance for which to set the RemoteViews.</param>
         <param name="views">The RemoteViews object containing the incremental update / command.</param>
-        <summary>Perform an incremental update or command on the widget specified by appWidgetId.</summary>
+        <summary>Perform an incremental update or command on the widget(s) specified by appWidgetIds.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#partiallyUpdateAppWidget(int,%20android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.partiallyUpdateAppWidget(int, android.widget.RemoteViews)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#partiallyUpdateAppWidget(int[],%20android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.partiallyUpdateAppWidget(int[], android.widget.RemoteViews)</code>.</a>
             </format>
           </para>
           <para>
@@ -1806,13 +1812,25 @@
         <Parameter Name="successCallback" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="provider">To be added.</param>
-        <param name="extras">To be added.</param>
-        <param name="successCallback">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="provider">The <c>ComponentName</c> for the <c>android.content.BroadcastReceiver BroadcastReceiver</c> provider for your AppWidget.</param>
+        <param name="extras">In not null, this is passed to the launcher app. For eg <c>#EXTRA_APPWIDGET_PREVIEW</c> can be used for a custom preview.</param>
+        <param name="successCallback">If not null, this intent will be sent when the widget is created.</param>
+        <summary>Request to pin an app widget on the current launcher.</summary>
+        <returns>
+          <c>TRUE</c> if the launcher supports this feature. Note the API will return without
+               waiting for the user to respond, so getting <c>TRUE</c> from this API does *not* mean
+               the shortcut is pinned. <c>FALSE</c> if the launcher doesn't support this feature.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#requestPinAppWidget(android.content.ComponentName,%20android.os.Bundle,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.requestPinAppWidget(android.content.ComponentName, android.os.Bundle, android.app.PendingIntent)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1902,15 +1920,14 @@
         <Parameter Name="views" Type="Android.Widget.RemoteViews" />
       </Parameters>
       <Docs>
-        <param name="provider">The <see cref="T:Android.Content.ComponentName" /> for the <see cref="T:Android.Content.BroadcastReceiver" /> provider
-                      for your AppWidget.</param>
-        <param name="appWidgetId">The AppWidget instance for which to set the RemoteViews.</param>
+        <param name="provider">The <c>ComponentName</c> for the <c>android.content.BroadcastReceiver BroadcastReceiver</c> provider
+                                 for your AppWidget.</param>
         <param name="views">The RemoteViews object to show.</param>
-        <summary>Set the RemoteViews to use for the specified appWidgetId.</summary>
+        <summary>Set the RemoteViews to use for all AppWidget instances for the supplied AppWidget provider.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#updateAppWidget(int,%20android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.updateAppWidget(int, android.widget.RemoteViews)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#updateAppWidget(android.content.ComponentName,%20android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.updateAppWidget(android.content.ComponentName, android.widget.RemoteViews)</code>.</a>
             </format>
           </para>
           <para>
@@ -1989,13 +2006,12 @@
       </Parameters>
       <Docs>
         <param name="appWidgetIds">The AppWidget instances for which to set the RemoteViews.</param>
-        <param name="appWidgetId">The AppWidget instance for which to set the RemoteViews.</param>
         <param name="views">The RemoteViews object to show.</param>
-        <summary>Set the RemoteViews to use for the specified appWidgetId.</summary>
+        <summary>Set the RemoteViews to use for the specified appWidgetIds.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#updateAppWidget(int,%20android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.updateAppWidget(int, android.widget.RemoteViews)</code>.</a>
+              <a href="https://developer.android.com/reference/android/appwidget/AppWidgetManager#updateAppWidget(int[],%20android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.appwidget.AppWidgetManager.updateAppWidget(int[], android.widget.RemoteViews)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeAdvertiser.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeAdvertiser.xml
index fdaef40113..a160d34853 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeAdvertiser.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeAdvertiser.xml
@@ -142,15 +142,15 @@
         <Parameter Name="callback" Type="Android.Bluetooth.LE.AdvertiseCallback" />
       </Parameters>
       <Docs>
-        <param name="scanResponse">Scan response associated with the advertisement data.</param>
         <param name="settings">Settings for Bluetooth LE advertising.</param>
-        <param name="advertiseData">Advertisement data to be broadcasted.</param>
+        <param name="advertiseData">Advertisement data to be advertised in advertisement packet.</param>
+        <param name="scanResponse">Scan response associated with the advertisement data.</param>
         <param name="callback">Callback for advertising status.</param>
         <summary>Start Bluetooth LE Advertising.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertising(android.bluetooth.le.AdvertiseSettings,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback)</code>.</a>
             </format>
           </para>
           <para>
@@ -201,17 +201,12 @@
         <param name="periodicParameters">periodic advertisng parameters. If null, periodic advertising will
             not be started.</param>
         <param name="periodicData">Periodic advertising data. Size must not exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c>.</param>
-        <param name="duration">advertising duration, in 10ms unit. Valid range is from 1 (10ms) to 65535
-            (655,350 ms). 0 means advertising should continue until stopped.</param>
-        <param name="maxExtendedAdvertisingEvents">maximum number of extended advertising events the
-            controller shall attempt to send prior to terminating the extended advertising, even if the
-            duration has not expired. Valid range is from 1 to 255. 0 means no maximum.</param>
         <param name="callback">Callback for advertising set.</param>
         <summary>Creates a new advertising set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.PeriodicAdvertisingParameters,%20android.bluetooth.le.AdvertiseData,%20int,%20int,%20android.bluetooth.le.AdvertisingSetCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.PeriodicAdvertisingParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertisingSetCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertisingSetCallback)</code>.</a>
             </format>
           </para>
           <para>
@@ -255,7 +250,6 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="parameters">advertising set parameters.</param>
         <param name="advertiseData">Advertisement data to be broadcasted. Size must not exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c>. If the advertisement is connectable,
             three bytes will be added for flags.</param>
@@ -264,17 +258,13 @@
         <param name="periodicParameters">periodic advertisng parameters. If null, periodic advertising will
             not be started.</param>
         <param name="periodicData">Periodic advertising data. Size must not exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c>.</param>
-        <param name="duration">advertising duration, in 10ms unit. Valid range is from 1 (10ms) to 65535
-            (655,350 ms). 0 means advertising should continue until stopped.</param>
-        <param name="maxExtendedAdvertisingEvents">maximum number of extended advertising events the
-            controller shall attempt to send prior to terminating the extended advertising, even if the
-            duration has not expired. Valid range is from 1 to 255. 0 means no maximum.</param>
         <param name="callback">Callback for advertising set.</param>
+        <param name="handler">thread upon which the callbacks will be invoked.</param>
         <summary>Creates a new advertising set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.PeriodicAdvertisingParameters,%20android.bluetooth.le.AdvertiseData,%20int,%20int,%20android.bluetooth.le.AdvertisingSetCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.PeriodicAdvertisingParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertisingSetCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertisingSetCallback, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -383,26 +373,26 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
-        <param name="parameters">advertising set parameters.</param>
+        <param name="parameters">Advertising set parameters.</param>
         <param name="advertiseData">Advertisement data to be broadcasted. Size must not exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c>. If the advertisement is connectable,
             three bytes will be added for flags.</param>
         <param name="scanResponse">Scan response associated with the advertisement data. Size must not
-            exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c>.</param>
-        <param name="periodicParameters">periodic advertisng parameters. If null, periodic advertising will
+            exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c></param>
+        <param name="periodicParameters">Periodic advertisng parameters. If null, periodic advertising will
             not be started.</param>
-        <param name="periodicData">Periodic advertising data. Size must not exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c>.</param>
+        <param name="periodicData">Periodic advertising data. Size must not exceed <c>BluetoothAdapter#getLeMaximumAdvertisingDataLength</c></param>
         <param name="duration">advertising duration, in 10ms unit. Valid range is from 1 (10ms) to 65535
             (655,350 ms). 0 means advertising should continue until stopped.</param>
         <param name="maxExtendedAdvertisingEvents">maximum number of extended advertising events the
             controller shall attempt to send prior to terminating the extended advertising, even if the
             duration has not expired. Valid range is from 1 to 255. 0 means no maximum.</param>
         <param name="callback">Callback for advertising set.</param>
+        <param name="handler">Thread upon which the callbacks will be invoked.</param>
         <summary>Creates a new advertising set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.PeriodicAdvertisingParameters,%20android.bluetooth.le.AdvertiseData,%20int,%20int,%20android.bluetooth.le.AdvertisingSetCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeAdvertiser#startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.AdvertiseData,%20android.bluetooth.le.PeriodicAdvertisingParameters,%20android.bluetooth.le.AdvertiseData,%20int,%20int,%20android.bluetooth.le.AdvertisingSetCallback,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeAdvertiser.startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeScanner.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeScanner.xml
index 8daf63f454..4f37d6d98e 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeScanner.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/BluetoothLeScanner.xml
@@ -288,16 +288,16 @@
         <Parameter Name="callbackIntent" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="filters">To be added.</param>
-        <param name="settings">To be added.</param>
-        <param name="callbackIntent">To be added.</param>
-        <param name="callback">Callback used to deliver scan results.</param>
-        <summary>Start Bluetooth LE scan with default parameters and no filters.</summary>
-        <returns>To be added.</returns>
+        <param name="filters">Optional list of ScanFilters for finding exact BLE devices.</param>
+        <param name="settings">Optional settings for the scan.</param>
+        <param name="callbackIntent">The PendingIntent to deliver the result to.</param>
+        <summary>Start Bluetooth LE scan using a <c>PendingIntent</c>.</summary>
+        <returns>Returns 0 for success or an error code from <c>ScanCallback</c> if the scan request
+            could not be sent.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeScanner#startScan(android.bluetooth.le.ScanCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeScanner.startScan(android.bluetooth.le.ScanCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeScanner#startScan(java.util.List,%20android.bluetooth.le.ScanSettings,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeScanner.startScan(java.util.List, android.bluetooth.le.ScanSettings, android.app.PendingIntent)</code>.</a>
             </format>
           </para>
           <para>
@@ -337,14 +337,15 @@
         <Parameter Name="callback" Type="Android.Bluetooth.LE.ScanCallback" />
       </Parameters>
       <Docs>
-        <param name="filters">To be added.</param>
-        <param name="settings">To be added.</param>
+        <param name="filters">
+          <c>ScanFilter</c>s for finding exact BLE devices.</param>
+        <param name="settings">Settings for the scan.</param>
         <param name="callback">Callback used to deliver scan results.</param>
-        <summary>Start Bluetooth LE scan with default parameters and no filters.</summary>
+        <summary>Start Bluetooth LE scan.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeScanner#startScan(android.bluetooth.le.ScanCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeScanner.startScan(android.bluetooth.le.ScanCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/BluetoothLeScanner#startScan(java.util.List,%20android.bluetooth.le.ScanSettings,%20android.bluetooth.le.ScanCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.BluetoothLeScanner.startScan(java.util.List, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback)</code>.</a>
             </format>
           </para>
           <para>
@@ -426,7 +427,6 @@
       </Parameters>
       <Docs>
         <param name="callback">To be added.</param>
-        <param name="callbackIntent">The PendingIntent that was used to start the scan.</param>
         <summary>Stops an ongoing Bluetooth LE scan started using a PendingIntent.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanRecord.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanRecord.xml
index 90248369b6..42b40f7099 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanRecord.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanRecord.xml
@@ -166,13 +166,12 @@
       </Parameters>
       <Docs>
         <param name="manufacturerId">To be added.</param>
-        <summary>Returns a sparse array of manufacturer identifier and its corresponding manufacturer specific
-            data.</summary>
+        <summary>Returns the manufacturer specific data associated with the manufacturer id.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord#getManufacturerSpecificData()" title="Reference documentation">Java documentation for <code>android.bluetooth.le.ScanRecord.getManufacturerSpecificData()</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord#getManufacturerSpecificData(int)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.ScanRecord.getManufacturerSpecificData(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -207,12 +206,12 @@
       </Parameters>
       <Docs>
         <param name="serviceDataUuid">To be added.</param>
-        <summary>Returns a map of service UUID and its corresponding service data.</summary>
+        <summary>Returns the service data byte array associated with the <c>serviceUuid</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord#getServiceData()" title="Reference documentation">Java documentation for <code>android.bluetooth.le.ScanRecord.getServiceData()</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord#getServiceData(android.os.ParcelUuid)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.ScanRecord.getServiceData(android.os.ParcelUuid)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult.xml b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult.xml
index 0986558daa..081f0dd583 100644
--- a/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth.LE/ScanResult.xml
@@ -74,20 +74,14 @@
       </Parameters>
       <Docs>
         <param name="device">Remote Bluetooth device found.</param>
-        <param name="eventType">Event type.</param>
-        <param name="primaryPhy">Primary advertising phy.</param>
-        <param name="secondaryPhy">Secondary advertising phy.</param>
-        <param name="advertisingSid">Advertising set ID.</param>
-        <param name="txPower">Transmit power.</param>
-        <param name="rssi">Received signal strength.</param>
-        <param name="periodicAdvertisingInterval">Periodic advertising interval.</param>
         <param name="scanRecord">Scan record including both advertising data and scan response data.</param>
+        <param name="rssi">Received signal strength.</param>
         <param name="timestampNanos">Timestamp at which the scan result was observed.</param>
         <summary>Constructs a new ScanResult.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/le/ScanResult#ScanResult(android.bluetooth.BluetoothDevice,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20android.bluetooth.le.ScanRecord,%20long)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.ScanResult.ScanResult(android.bluetooth.BluetoothDevice, int, int, int, int, int, int, int, android.bluetooth.le.ScanRecord, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/le/ScanResult#ScanResult(android.bluetooth.BluetoothDevice,%20android.bluetooth.le.ScanRecord,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.bluetooth.le.ScanResult.ScanResult(android.bluetooth.BluetoothDevice, android.bluetooth.le.ScanRecord, int, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothAdapter.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothAdapter.xml
index 7f192024fa..05b7251044 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothAdapter.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothAdapter.xml
@@ -1235,14 +1235,14 @@
         <Parameter Name="address" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="address">valid Bluetooth MAC address</param>
+        <param name="address">Bluetooth MAC address (6 bytes)</param>
         <summary>Get a <c>BluetoothDevice</c> object for the given Bluetooth hardware
             address.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter#getRemoteDevice(java.lang.String)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothAdapter.getRemoteDevice(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter#getRemoteDevice(byte[])" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothAdapter.getRemoteDevice(byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice.xml
index 6560278a7f..25ad404283 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothDevice.xml
@@ -807,16 +807,16 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
-        <param name="transport">To be added.</param>
         <param name="callback">GATT callback handler that will receive asynchronous callbacks.</param>
         <param name="autoConnect">Whether to directly connect to the remote device (false) or to
             automatically connect as soon as the remote device becomes available (true).</param>
+        <param name="transport">preferred transport for GATT connections to remote dual-mode devices <c>BluetoothDevice#TRANSPORT_AUTO</c> or <c>BluetoothDevice#TRANSPORT_BREDR</c> or <c>BluetoothDevice#TRANSPORT_LE</c></param>
         <summary>Connect to GATT Server hosted by this device.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice#connectGatt(android.content.Context,%20boolean,%20android.bluetooth.BluetoothGattCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothDevice.connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice#connectGatt(android.content.Context,%20boolean,%20android.bluetooth.BluetoothGattCallback,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothDevice.connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -873,17 +873,18 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
-        <param name="transport">To be added.</param>
-        <param name="phy">To be added.</param>
         <param name="callback">GATT callback handler that will receive asynchronous callbacks.</param>
         <param name="autoConnect">Whether to directly connect to the remote device (false) or to
             automatically connect as soon as the remote device becomes available (true).</param>
+        <param name="transport">preferred transport for GATT connections to remote dual-mode devices <c>BluetoothDevice#TRANSPORT_AUTO</c> or <c>BluetoothDevice#TRANSPORT_BREDR</c> or <c>BluetoothDevice#TRANSPORT_LE</c></param>
+        <param name="phy">preferred PHY for connections to remote LE device. Bitwise OR of any of <c>BluetoothDevice#PHY_LE_1M_MASK</c>, <c>BluetoothDevice#PHY_LE_2M_MASK</c>, and <c>BluetoothDevice#PHY_LE_CODED_MASK</c>. This option does not take effect if <c>autoConnect</c>
+            is set to true.</param>
         <summary>Connect to GATT Server hosted by this device.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice#connectGatt(android.content.Context,%20boolean,%20android.bluetooth.BluetoothGattCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothDevice.connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice#connectGatt(android.content.Context,%20boolean,%20android.bluetooth.BluetoothGattCallback,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothDevice.connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -994,18 +995,20 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
-        <param name="transport">To be added.</param>
-        <param name="phy">To be added.</param>
-        <param name="handler">To be added.</param>
         <param name="callback">GATT callback handler that will receive asynchronous callbacks.</param>
         <param name="autoConnect">Whether to directly connect to the remote device (false) or to
             automatically connect as soon as the remote device becomes available (true).</param>
+        <param name="transport">preferred transport for GATT connections to remote dual-mode devices <c>BluetoothDevice#TRANSPORT_AUTO</c> or <c>BluetoothDevice#TRANSPORT_BREDR</c> or <c>BluetoothDevice#TRANSPORT_LE</c></param>
+        <param name="phy">preferred PHY for connections to remote LE device. Bitwise OR of any of <c>BluetoothDevice#PHY_LE_1M_MASK</c>, <c>BluetoothDevice#PHY_LE_2M_MASK</c>, an d<c>BluetoothDevice#PHY_LE_CODED_MASK</c>. This option does not take effect if <c>autoConnect</c>
+            is set to true.</param>
+        <param name="handler">The handler to use for the callback. If <c>null</c>, callbacks will happen on
+            an un-specified background thread.</param>
         <summary>Connect to GATT Server hosted by this device.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice#connectGatt(android.content.Context,%20boolean,%20android.bluetooth.BluetoothGattCallback)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothDevice.connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice#connectGatt(android.content.Context,%20boolean,%20android.bluetooth.BluetoothGattCallback,%20int,%20int,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothDevice.connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -2287,10 +2290,19 @@
       </Parameters>
       <Docs>
         <param name="pin">To be added.</param>
-        <summary>Set the pin during pairing when the pairing method is <see cref="F:Android.Bluetooth.BluetoothDevice.PairingVariantPin" /></summary>
-        <returns>To be added.</returns>
+        <summary>Set the pin during pairing when the pairing method is <c>#PAIRING_VARIANT_PIN</c></summary>
+        <returns>true pin has been set false for error</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice#setPin(byte[])" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothDevice.setPin(byte[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGatt.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGatt.xml
index 99cf3ea251..461c797035 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGatt.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGatt.xml
@@ -123,7 +123,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt#abortReliableWrite()" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGatt.abortReliableWrite()</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt#abortReliableWrite(android.bluetooth.BluetoothDevice)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGatt.abortReliableWrite(android.bluetooth.BluetoothDevice)</code>.</a>
             </format>
           </para>
           <para>
@@ -1160,11 +1160,21 @@
       </Parameters>
       <Docs>
         <param name="uuid">UUID of the requested service</param>
-        <summary>Returns a <see cref="T:Android.Bluetooth.BluetoothGattService" />, if the requested UUID is
- supported by the remote device.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns a <c>BluetoothGattService</c>, if the requested UUID is
+            supported by the remote device.</summary>
+        <returns>BluetoothGattService if supported, or null if the requested service is not offered by
+            the remote device.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt#getService(java.util.UUID)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGatt.getService(java.util.UUID)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 18" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic.xml
index 02eb02e3de..9c9310574a 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattCharacteristic.xml
@@ -106,12 +106,21 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="uuid">To be added.</param>
-        <param name="properties">To be added.</param>
-        <param name="permissions">To be added.</param>
+        <param name="uuid">The UUID for this characteristic</param>
+        <param name="properties">Properties of this characteristic</param>
+        <param name="permissions">Permissions for this characteristic</param>
         <summary>Create a new BluetoothGattCharacteristic.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#BluetoothGattCharacteristic(java.util.UUID,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattCharacteristic.BluetoothGattCharacteristic(java.util.UUID, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 18" />
       </Docs>
@@ -1775,14 +1784,13 @@
       </Parameters>
       <Docs>
         <param name="value">New value for this characteristic</param>
-        <param name="formatType">Integer format type used to transform the value parameter</param>
-        <param name="offset">Offset at which the value should be placed</param>
-        <summary>Set the locally stored value of this characteristic.</summary>
-        <returns>true if the locally stored value has been set</returns>
+        <summary>Updates the locally stored value of this characteristic.</summary>
+        <returns>true if the locally stored value has been set, false if the requested value could not
+            be stored locally.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#setValue(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattCharacteristic.setValue(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#setValue(byte[])" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattCharacteristic.setValue(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1818,14 +1826,12 @@
       </Parameters>
       <Docs>
         <param name="value">New value for this characteristic</param>
-        <param name="formatType">Integer format type used to transform the value parameter</param>
-        <param name="offset">Offset at which the value should be placed</param>
         <summary>Set the locally stored value of this characteristic.</summary>
         <returns>true if the locally stored value has been set</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#setValue(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattCharacteristic.setValue(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#setValue(java.lang.String)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattCharacteristic.setValue(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1924,15 +1930,14 @@
       <Docs>
         <param name="mantissa">Mantissa for this characteristic</param>
         <param name="exponent">exponent value for this characteristic</param>
-        <param name="value">New value for this characteristic</param>
-        <param name="formatType">Integer format type used to transform the value parameter</param>
+        <param name="formatType">Float format type used to transform the value parameter</param>
         <param name="offset">Offset at which the value should be placed</param>
         <summary>Set the locally stored value of this characteristic.</summary>
         <returns>true if the locally stored value has been set</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#setValue(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattCharacteristic.setValue(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic#setValue(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattCharacteristic.setValue(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor.xml
index 06f2c06610..d51ed89b92 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattDescriptor.xml
@@ -75,14 +75,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="characteristic">The characteristic this descriptor belongs to</param>
         <param name="uuid">The UUID for this descriptor</param>
         <param name="permissions">Permissions for this descriptor</param>
         <summary>Create a new BluetoothGattDescriptor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor#BluetoothGattDescriptor(android.bluetooth.BluetoothGattCharacteristic,%20java.util.UUID,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattDescriptor.BluetoothGattDescriptor(android.bluetooth.BluetoothGattCharacteristic, java.util.UUID, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor#BluetoothGattDescriptor(java.util.UUID,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattDescriptor.BluetoothGattDescriptor(java.util.UUID, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService.xml
index dbae406cb3..d010e1c152 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothGattService.xml
@@ -75,11 +75,22 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="uuid">To be added.</param>
-        <param name="serviceType">To be added.</param>
+        <param name="uuid">The UUID for this service</param>
+        <param name="serviceType">The type of this service,
+            <c>BluetoothGattService#SERVICE_TYPE_PRIMARY</c>
+            or <c>BluetoothGattService#SERVICE_TYPE_SECONDARY</c></param>
         <summary>Create a new BluetoothGattService.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService#BluetoothGattService(java.util.UUID,%20int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothGattService.BluetoothGattService(java.util.UUID, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 18" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Bluetooth/BluetoothServerSocket.xml b/docs/Mono.Android/en/Android.Bluetooth/BluetoothServerSocket.xml
index 5983b6fd54..0b485618c8 100644
--- a/docs/Mono.Android/en/Android.Bluetooth/BluetoothServerSocket.xml
+++ b/docs/Mono.Android/en/Android.Bluetooth/BluetoothServerSocket.xml
@@ -108,12 +108,12 @@
       </Parameters>
       <Docs>
         <param name="timeout">To be added.</param>
-        <summary>Block until a connection is established.</summary>
+        <summary>Block until a connection is established, with timeout.</summary>
         <returns>a connected <c>BluetoothSocket</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothServerSocket#accept()" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothServerSocket.accept()</code>.</a>
+              <a href="https://developer.android.com/reference/android/bluetooth/BluetoothServerSocket#accept(int)" title="Reference documentation">Java documentation for <code>android.bluetooth.BluetoothServerSocket.accept(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/CrossProfileApps.xml b/docs/Mono.Android/en/Android.Content.PM/CrossProfileApps.xml
index a15d9dba1a..f02d85c9f8 100644
--- a/docs/Mono.Android/en/Android.Content.PM/CrossProfileApps.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/CrossProfileApps.xml
@@ -384,11 +384,27 @@
         <Parameter Name="callingActivity" Type="Android.App.Activity" />
       </Parameters>
       <Docs>
-        <param name="intent">To be added.</param>
-        <param name="targetUser">To be added.</param>
-        <param name="callingActivity">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="intent">The intent to launch. A component in the caller package must be specified.</param>
+        <param name="targetUser">The <c>UserHandle</c> of the profile; must be one of the users returned by
+                   <c>#getTargetUserProfiles()</c> if different to the calling user, otherwise a
+                   <c>SecurityException</c> will be thrown.</param>
+        <param name="callingActivity">The activity to start the new activity from for the purposes of
+                   passing back any result and deciding which task the new activity should belong to. If
+                   <c>null</c>, the activity will always be started in a new task and no result will be
+                   returned.</param>
+        <summary>Starts the specified activity of the caller package in the specified profile.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/pm/CrossProfileApps#startActivity(android.content.Intent,%20android.os.UserHandle,%20android.app.Activity)" title="Reference documentation">Java documentation for <code>android.content.pm.CrossProfileApps.startActivity(android.content.Intent, android.os.UserHandle, android.app.Activity)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="StartActivity">
@@ -417,12 +433,28 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="intent">To be added.</param>
-        <param name="targetUser">To be added.</param>
-        <param name="callingActivity">To be added.</param>
-        <param name="options">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="intent">The intent to launch. A component in the caller package must be specified.</param>
+        <param name="targetUser">The <c>UserHandle</c> of the profile; must be one of the users returned by
+                   <c>#getTargetUserProfiles()</c> if different to the calling user, otherwise a
+                   <c>SecurityException</c> will be thrown.</param>
+        <param name="callingActivity">The activity to start the new activity from for the purposes of
+                   passing back any result and deciding which task the new activity should belong to. If
+                   <c>null</c>, the activity will always be started in a new task and no result will be
+                   returned.</param>
+        <param name="options">The activity options or <c>null</c>. See <c>android.app.ActivityOptions</c>.</param>
+        <summary>Starts the specified activity of the caller package in the specified profile.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/pm/CrossProfileApps#startActivity(android.content.Intent,%20android.os.UserHandle,%20android.app.Activity,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.pm.CrossProfileApps.startActivity(android.content.Intent, android.os.UserHandle, android.app.Activity, android.os.Bundle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="StartMainActivity">
diff --git a/docs/Mono.Android/en/Android.Content.PM/LabeledIntent.xml b/docs/Mono.Android/en/Android.Content.PM/LabeledIntent.xml
index 54d6237eea..eaa7273bd2 100644
--- a/docs/Mono.Android/en/Android.Content.PM/LabeledIntent.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/LabeledIntent.xml
@@ -80,17 +80,15 @@
         <Parameter Name="icon" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="nonLocalizedLabel">To be added.</param>
-        <param name="origIntent">The original Intent to copy.</param>
         <param name="sourcePackage">The package in which the label and icon live.</param>
-        <param name="labelRes">Resource containing the label, or 0 if none.</param>
+        <param name="nonLocalizedLabel">Concrete text to use for the label.</param>
         <param name="icon">Resource containing the icon, or 0 if none.</param>
-        <summary>Create a labeled intent from the given intent, supplying the label
-            and icon resources for it.</summary>
+        <summary>Create a labeled intent with no intent data but supplying a textual
+            label and icon resource for it.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/LabeledIntent#LabeledIntent(android.content.Intent,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.LabeledIntent.LabeledIntent(android.content.Intent, java.lang.String, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/LabeledIntent#LabeledIntent(java.lang.String,%20java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.LabeledIntent.LabeledIntent(java.lang.String, java.lang.CharSequence, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,16 +122,15 @@
         <Parameter Name="icon" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="origIntent">The original Intent to copy.</param>
         <param name="sourcePackage">The package in which the label and icon live.</param>
         <param name="labelRes">Resource containing the label, or 0 if none.</param>
         <param name="icon">Resource containing the icon, or 0 if none.</param>
-        <summary>Create a labeled intent from the given intent, supplying the label
+        <summary>Create a labeled intent with no intent data but supplying the label
             and icon resources for it.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/LabeledIntent#LabeledIntent(android.content.Intent,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.LabeledIntent.LabeledIntent(android.content.Intent, java.lang.String, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/LabeledIntent#LabeledIntent(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.LabeledIntent.LabeledIntent(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -201,17 +198,16 @@
         <Parameter Name="icon" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="nonLocalizedLabel">To be added.</param>
         <param name="origIntent">The original Intent to copy.</param>
         <param name="sourcePackage">The package in which the label and icon live.</param>
-        <param name="labelRes">Resource containing the label, or 0 if none.</param>
+        <param name="nonLocalizedLabel">Concrete text to use for the label.</param>
         <param name="icon">Resource containing the icon, or 0 if none.</param>
-        <summary>Create a labeled intent from the given intent, supplying the label
-            and icon resources for it.</summary>
+        <summary>Create a labeled intent from the given intent, supplying a textual
+            label and icon resource for it.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/LabeledIntent#LabeledIntent(android.content.Intent,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.LabeledIntent.LabeledIntent(android.content.Intent, java.lang.String, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/LabeledIntent#LabeledIntent(android.content.Intent,%20java.lang.String,%20java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.LabeledIntent.LabeledIntent(android.content.Intent, java.lang.String, java.lang.CharSequence, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/LauncherApps.xml b/docs/Mono.Android/en/Android.Content.PM/LauncherApps.xml
index 99780a4dc1..683f40f985 100644
--- a/docs/Mono.Android/en/Android.Content.PM/LauncherApps.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/LauncherApps.xml
@@ -937,9 +937,9 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
+        <param name="callback">The callback to register.</param>
         <param name="handler">that should be used to post callbacks on, may be null.
 </param>
-        <param name="callback">The callback to register.</param>
         <summary>Registers a callback for changes to packages in this user and managed profiles.</summary>
         <remarks>
           <para>
@@ -979,9 +979,9 @@
         <Parameter Name="callback" Type="Android.Content.PM.PackageInstaller+SessionCallback" />
       </Parameters>
       <Docs>
-        <param name="callback">The callback to register.</param>
         <param name="executor">
           <c>Executor</c> to handle the callbacks, cannot be null.</param>
+        <param name="callback">The callback to register.</param>
         <summary>Register a callback to watch for session lifecycle events in this user and managed profiles.</summary>
         <remarks>
           <para>
@@ -1274,17 +1274,16 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="shortcutId">To be added.</param>
-        <param name="user">To be added.</param>
-        <param name="shortcut">The target shortcut.</param>
+        <param name="packageName">The target shortcut package name.</param>
+        <param name="shortcutId">The target shortcut ID.</param>
         <param name="sourceBounds">The Rect containing the source bounds of the clicked icon.</param>
         <param name="startActivityOptions">Options to pass to startActivity.</param>
-        <summary>Launches a shortcut.</summary>
+        <param name="user">The UserHandle of the profile.</param>
+        <summary>Starts a shortcut.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/LauncherApps#startShortcut(android.content.pm.ShortcutInfo,%20android.graphics.Rect,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.pm.LauncherApps.startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/LauncherApps#startShortcut(java.lang.String,%20java.lang.String,%20android.graphics.Rect,%20android.os.Bundle,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.content.pm.LauncherApps.startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageInstaller.xml b/docs/Mono.Android/en/Android.Content.PM/PackageInstaller.xml
index 0611f55298..6340ba030d 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageInstaller.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageInstaller.xml
@@ -1027,11 +1027,21 @@
         <Parameter Name="statusReceiver" Type="Android.Content.IntentSender" />
       </Parameters>
       <Docs>
-        <param name="versionedPackage">To be added.</param>
-        <param name="statusReceiver">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="versionedPackage">The versioned package to uninstall.</param>
+        <param name="statusReceiver">Where to deliver the result.</param>
+        <summary>Uninstall the given package with a specific version code, removing it
+            completely from the device.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/pm/PackageInstaller#uninstall(android.content.pm.VersionedPackage,%20android.content.IntentSender)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageInstaller.uninstall(android.content.pm.VersionedPackage, android.content.IntentSender)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1059,11 +1069,20 @@
         <Parameter Name="statusReceiver" Type="Android.Content.IntentSender" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="statusReceiver">To be added.</param>
+        <param name="packageName">The package to uninstall.</param>
+        <param name="statusReceiver">Where to deliver the result.</param>
         <summary>Uninstall the given package, removing it completely from the device.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/pm/PackageInstaller#uninstall(java.lang.String,%20android.content.IntentSender)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageInstaller.uninstall(java.lang.String, android.content.IntentSender)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml b/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml
index 2418ac9d5a..8f15b44616 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PackageManager.xml
@@ -5776,14 +5776,13 @@
       </Parameters>
       <Docs>
         <param name="intent">The intent for which you would like to retrieve a banner.</param>
-        <param name="activityName">Name of the activity whose banner is to be retrieved.</param>
-        <summary>Retrieve the banner associated with an activity.</summary>
+        <summary>Retrieve the banner associated with an Intent.</summary>
         <returns>Returns the image of the banner, or null if the activity has no
                     banner specified.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getActivityBanner(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getActivityBanner(android.content.ComponentName)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getActivityBanner(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getActivityBanner(android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
@@ -5866,14 +5865,13 @@
       </Parameters>
       <Docs>
         <param name="intent">The intent for which you would like to retrieve an icon.</param>
-        <param name="activityName">Name of the activity whose icon is to be retrieved.</param>
-        <summary>Retrieve the icon associated with an activity.</summary>
+        <summary>Retrieve the icon associated with an Intent.</summary>
         <returns>Returns the image of the icon, or the default activity icon if
             it could not be found.  Does not return null.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getActivityIcon(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getActivityIcon(android.content.ComponentName)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getActivityIcon(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getActivityIcon(android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
@@ -6012,14 +6010,13 @@
       </Parameters>
       <Docs>
         <param name="intent">The intent for which you would like to retrieve a logo.</param>
-        <param name="activityName">Name of the activity whose logo is to be retrieved.</param>
-        <summary>Retrieve the logo associated with an activity.</summary>
-        <returns>Returns the image of the logo or null if the activity has no logo
-                    specified.</returns>
+        <summary>Retrieve the logo associated with an Intent.</summary>
+        <returns>Returns the image of the logo, or null if the activity has no
+            logo specified.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getActivityLogo(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getActivityLogo(android.content.ComponentName)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getActivityLogo(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getActivityLogo(android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
@@ -6149,15 +6146,14 @@
       </Parameters>
       <Docs>
         <param name="packageName">Name of the package whose application banner is to be
-            retrieved.</param>
-        <param name="info">Information about application being queried.</param>
+                       retrieved.</param>
         <summary>Retrieve the banner associated with an application.</summary>
         <returns>Returns the image of the banner or null if the application has no
                     banner specified.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getApplicationBanner(android.content.pm.ApplicationInfo)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getApplicationBanner(android.content.pm.ApplicationInfo)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getApplicationBanner(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getApplicationBanner(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -6281,15 +6277,14 @@
       </Parameters>
       <Docs>
         <param name="packageName">Name of the package whose application icon is to be
-                    retrieved.</param>
-        <param name="info">Information about application being queried.</param>
+                               retrieved.</param>
         <summary>Retrieve the icon associated with an application.</summary>
         <returns>Returns the image of the icon, or the default application icon
-            if it could not be found.</returns>
+            if it could not be found.  Does not return null.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getApplicationIcon(android.content.pm.ApplicationInfo)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getApplicationIcon(android.content.pm.ApplicationInfo)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getApplicationIcon(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getApplicationIcon(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -6507,15 +6502,14 @@
       </Parameters>
       <Docs>
         <param name="packageName">Name of the package whose application logo is to be
-                    retrieved.</param>
-        <param name="info">Information about application being queried.</param>
+                               retrieved.</param>
         <summary>Retrieve the logo associated with an application.</summary>
-        <returns>Returns the image of the logo, or null if no logo is specified
-            by the application.</returns>
+        <returns>Returns the image of the logo, or null if no application logo
+            has been specified.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getApplicationLogo(android.content.pm.ApplicationInfo)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getApplicationLogo(android.content.pm.ApplicationInfo)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getApplicationLogo(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getApplicationLogo(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -7429,12 +7423,12 @@
                        desired package.</param>
         <summary>Return an array of all of the POSIX secondary group IDs that have been
             assigned to the given package.</summary>
-        <returns>Returns an int array of the assigned GIDs, or null if there are
+        <returns>Returns an int array of the assigned gids, or null if there are
                     none.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getPackageGids(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getPackageGids(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getPackageGids(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getPackageGids(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -7533,8 +7527,7 @@
       </Parameters>
       <Docs>
         <param name="packageName">The full name (i.e. com.google.apps.contacts) of the
-            desired package.</param>
-        <param name="versionedPackage">The versioned package for which to query.</param>
+                       desired package.</param>
         <param name="flags">Additional option flags to modify the data returned.</param>
         <summary>Retrieve overall information about an application package that is
             installed on the system.</summary>
@@ -7548,7 +7541,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getPackageInfo(android.content.pm.VersionedPackage,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getPackageInfo(android.content.pm.VersionedPackage, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getPackageInfo(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getPackageInfo(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -8274,14 +8267,14 @@
         <Parameter Name="packageName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="app">Information about the desired application.</param>
-        <summary>Retrieve the resources for an application.</summary>
+        <param name="packageName">Package name of the application whose resources
+                                  are to be retrieved.</param>
+        <summary>Retrieve the resources associated with an application.</summary>
         <returns>Returns the application's Resources.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getResourcesForApplication(android.content.pm.ApplicationInfo)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getResourcesForApplication(android.content.pm.ApplicationInfo)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getResourcesForApplication(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getResourcesForApplication(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -8320,14 +8313,14 @@
         <Parameter Name="configuration" Type="Android.Content.Res.Configuration" />
       </Parameters>
       <Docs>
-        <param name="configuration">To be added.</param>
         <param name="app">Information about the desired application.</param>
-        <summary>Retrieve the resources for an application.</summary>
+        <param name="configuration">Overridden configuration when loading the Resources</param>
+        <summary>Retrieve the resources for an application for the provided configuration.</summary>
         <returns>Returns the application's Resources.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getResourcesForApplication(android.content.pm.ApplicationInfo)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getResourcesForApplication(android.content.pm.ApplicationInfo)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#getResourcesForApplication(android.content.pm.ApplicationInfo,%20android.content.res.Configuration)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.getResourcesForApplication(android.content.pm.ApplicationInfo, android.content.res.Configuration)</code>.</a>
             </format>
           </para>
           <para>
@@ -9064,17 +9057,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="uid">uid whose signing certificates to check</param>
+        <param name="packageName">package whose signing certificates to check</param>
         <param name="certificate">signing certificate for which to search</param>
         <param name="type">representation of the <c>certificate</c></param>
-        <summary>Searches the set of signing certificates by which the package(s) for the given uid has proven
-            to have been signed.</summary>
+        <summary>Searches the set of signing certificates by which the given package has proven to have been
+            signed.</summary>
         <returns>true if this package was or is signed by exactly the certificate <c>certificate</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#hasSigningCertificate(int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.hasSigningCertificate(int, byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#hasSigningCertificate(java.lang.String,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.hasSigningCertificate(java.lang.String, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -9153,13 +9145,13 @@
       <Docs>
         <param name="featureName">To be added.</param>
         <param name="version">To be added.</param>
-        <summary>Check whether the given feature name is one of the available features as
-            returned by <c>#getSystemAvailableFeatures()</c>.</summary>
+        <summary>Check whether the given feature name and version is one of the available
+            features as returned by <c>#getSystemAvailableFeatures()</c>.</summary>
         <returns>Returns true if the devices supports the feature, else false.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#hasSystemFeature(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.hasSystemFeature(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#hasSystemFeature(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.hasSystemFeature(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -9386,15 +9378,14 @@
         <Parameter Name="packageName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <summary>&lt;strong&gt;Note: &lt;/strong&gt;In retrospect it would have been preferred to use
-            more inclusive terminology when naming this API.</summary>
-        <returns>whether this package is whitelisted from having its runtime permission be
-                    auto-revoked if unused for an extended period of time.</returns>
+        <param name="packageName">The app for which to set exemption.</param>
+        <summary>Checks whether an application is exempt from having its permissions be automatically revoked
+            when the app is unused for an extended period of time.</summary>
+        <returns>Whether the app is whitelisted.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#isAutoRevokeWhitelisted()" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.isAutoRevokeWhitelisted()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#isAutoRevokeWhitelisted(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.isAutoRevokeWhitelisted(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -9428,13 +9419,13 @@
         <Parameter Name="packageName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <summary>Gets whether this application is an instant app.</summary>
-        <returns>Whether caller is an instant app.</returns>
+        <param name="packageName">The package to check</param>
+        <summary>Gets whether the given package is an instant app.</summary>
+        <returns>Whether the given package is an instant app.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#isInstantApp()" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.isInstantApp()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#isInstantApp(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.isInstantApp(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -9469,13 +9460,13 @@
       </Parameters>
       <Docs>
         <param name="packageName">To be added.</param>
-        <summary>Apps can query this to know if they have been suspended.</summary>
+        <summary>Query if an app is currently suspended.</summary>
         <returns>
-          <c>true</c> if the calling package has been suspended, <c>false</c> otherwise.</returns>
+          <c>true</c> if the given package is suspended, <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#isPackageSuspended()" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.isPackageSuspended()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PackageManager#isPackageSuspended(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.PackageManager.isPackageSuspended(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml b/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml
index 3586f564fa..f2ff8412c3 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PermissionGroupInfo.xml
@@ -116,7 +116,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PermissionGroupInfo#PermissionGroupInfo()" title="Reference documentation">Java documentation for <code>android.content.pm.PermissionGroupInfo.PermissionGroupInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PermissionGroupInfo#PermissionGroupInfo(android.content.pm.PermissionGroupInfo)" title="Reference documentation">Java documentation for <code>android.content.pm.PermissionGroupInfo.PermissionGroupInfo(android.content.pm.PermissionGroupInfo)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml b/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml
index ed39ddbe4a..cab4aa65ae 100644
--- a/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/PermissionInfo.xml
@@ -116,7 +116,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/PermissionInfo#PermissionInfo()" title="Reference documentation">Java documentation for <code>android.content.pm.PermissionInfo.PermissionInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/PermissionInfo#PermissionInfo(android.content.pm.PermissionInfo)" title="Reference documentation">Java documentation for <code>android.content.pm.PermissionInfo.PermissionInfo(android.content.pm.PermissionInfo)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml b/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml
index e843cd919e..5e76c217b1 100644
--- a/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/ShortcutManager.xml
@@ -209,11 +209,12 @@
       <Docs>
         <param name="shortcutIds">To be added.</param>
         <param name="disabledMessage">To be added.</param>
-        <summary>Disable pinned shortcuts.</summary>
+        <summary>Disable pinned shortcuts, showing the user a custom error message when they try to select
+            the disabled shortcuts.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/ShortcutManager#disableShortcuts(java.util.List)" title="Reference documentation">Java documentation for <code>android.content.pm.ShortcutManager.disableShortcuts(java.util.List)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/ShortcutManager#disableShortcuts(java.util.List,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.content.pm.ShortcutManager.disableShortcuts(java.util.List, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -244,11 +245,12 @@
       <Docs>
         <param name="shortcutIds">To be added.</param>
         <param name="disabledMessage">To be added.</param>
-        <summary>Disable pinned shortcuts.</summary>
+        <summary>Disable pinned shortcuts, showing the user a custom error message when they try to select
+            the disabled shortcuts.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/ShortcutManager#disableShortcuts(java.util.List)" title="Reference documentation">Java documentation for <code>android.content.pm.ShortcutManager.disableShortcuts(java.util.List)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/ShortcutManager#disableShortcuts(java.util.List,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.content.pm.ShortcutManager.disableShortcuts(java.util.List, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/Signature.xml b/docs/Mono.Android/en/Android.Content.PM/Signature.xml
index e875f30152..1e3cd908fa 100644
--- a/docs/Mono.Android/en/Android.Content.PM/Signature.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/Signature.xml
@@ -71,7 +71,16 @@
         <param name="signature">To be added.</param>
         <summary>Create Signature from an existing raw byte array.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/pm/Signature#Signature(byte[])" title="Reference documentation">Java documentation for <code>android.content.pm.Signature.Signature(byte[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -96,11 +105,20 @@
         <Parameter Name="text" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
+        <param name="text">hex-encoded string representing the signature</param>
         <summary>Create Signature from a text representation previously returned by
- <see cref="M:Android.Content.PM.Signature.ToChars" /> or <see cref="M:Android.Content.PM.Signature.ToCharsString" />.</summary>
+            <c>#toChars</c> or <c>#toCharsString()</c>.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/pm/Signature#Signature(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.pm.Signature.Signature(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <exception cref="T:Java.Lang.IllegalArgumentException">when signature is odd-length
@@ -391,13 +409,15 @@
       <Docs>
         <param name="existingArray">Existing char array or null.</param>
         <param name="outLen">Output parameter for the number of characters written in
- to the array.</param>
-        <summary>Encode the Signature as ASCII text.</summary>
-        <returns>To be added.</returns>
+            to the array.</param>
+        <summary>Encode the Signature as ASCII text in to an existing array.</summary>
+        <returns>Returns either &lt;var&gt;existingArray&lt;/var&gt; if it was large enough
+            to hold the ASCII representation, or a newly created char[] array if
+            needed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/Signature#toChars()" title="Reference documentation">Java documentation for <code>android.content.pm.Signature.toChars()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/Signature#toChars(char[],%20int[])" title="Reference documentation">Java documentation for <code>android.content.pm.Signature.toChars(char[], int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.PM/VersionedPackage.xml b/docs/Mono.Android/en/Android.Content.PM/VersionedPackage.xml
index 3b0c928c59..75770e2b4a 100644
--- a/docs/Mono.Android/en/Android.Content.PM/VersionedPackage.xml
+++ b/docs/Mono.Android/en/Android.Content.PM/VersionedPackage.xml
@@ -111,7 +111,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/pm/VersionedPackage#VersionedPackage(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.pm.VersionedPackage.VersionedPackage(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/pm/VersionedPackage#VersionedPackage(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>android.content.pm.VersionedPackage.VersionedPackage(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.Res.Loader/ResourcesProvider.xml b/docs/Mono.Android/en/Android.Content.Res.Loader/ResourcesProvider.xml
index 09d1bb2b13..ae5e08047e 100644
--- a/docs/Mono.Android/en/Android.Content.Res.Loader/ResourcesProvider.xml
+++ b/docs/Mono.Android/en/Android.Content.Res.Loader/ResourcesProvider.xml
@@ -247,14 +247,14 @@
         <Parameter Name="assetsProvider" Type="Android.Content.Res.Loader.IAssetsProvider" />
       </Parameters>
       <Docs>
-        <param name="assetsProvider">To be added.</param>
         <param name="fileDescriptor">the file descriptor of the APK to load</param>
+        <param name="assetsProvider">the assets provider that overrides the loading of file-based resources</param>
         <summary>Creates a ResourcesProvider from an APK (<c>.apk</c>) file descriptor.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/loader/ResourcesProvider#loadFromApk(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.content.res.loader.ResourcesProvider.loadFromApk(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/loader/ResourcesProvider#loadFromApk(android.os.ParcelFileDescriptor,%20android.content.res.loader.AssetsProvider)" title="Reference documentation">Java documentation for <code>android.content.res.loader.ResourcesProvider.loadFromApk(android.os.ParcelFileDescriptor, android.content.res.loader.AssetsProvider)</code>.</a>
             </format>
           </para>
           <para>
@@ -374,11 +374,22 @@
         <Parameter Name="assetsProvider" Type="Android.Content.Res.Loader.IAssetsProvider" />
       </Parameters>
       <Docs>
-        <param name="fileDescriptor">To be added.</param>
-        <param name="assetsProvider">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="fileDescriptor">the file descriptor of the resources table to load</param>
+        <param name="assetsProvider">the assets provider that implements the loading of file-based resources</param>
+        <summary>Creates a ResourcesProvider from a resources table (<c>.arsc</c>) file descriptor.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/res/loader/ResourcesProvider#loadFromTable(android.os.ParcelFileDescriptor,%20android.content.res.loader.AssetsProvider)" title="Reference documentation">Java documentation for <code>android.content.res.loader.ResourcesProvider.loadFromTable(android.os.ParcelFileDescriptor, android.content.res.loader.AssetsProvider)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="ThresholdClass">
diff --git a/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml b/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml
index 3bc005e02f..236a2ba224 100644
--- a/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/AssetFileDescriptor.xml
@@ -139,17 +139,18 @@
         <Parameter Name="extras" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="extras">To be added.</param>
         <param name="fd">The underlying file descriptor.</param>
         <param name="startOffset">The location within the file that the asset starts.
                        This must be 0 if length is UNKNOWN_LENGTH.</param>
         <param name="length">The number of bytes of the asset, or
                        <c>#UNKNOWN_LENGTH</c> if it extends to the end of the file.</param>
+        <param name="extras">additional details that can be used to interpret the
+                       underlying file descriptor. May be null.</param>
         <summary>Create a new AssetFileDescriptor from the given values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor#AssetFileDescriptor(android.os.ParcelFileDescriptor,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.content.res.AssetFileDescriptor.AssetFileDescriptor(android.os.ParcelFileDescriptor, long, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor#AssetFileDescriptor(android.os.ParcelFileDescriptor,%20long,%20long,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.res.AssetFileDescriptor.AssetFileDescriptor(android.os.ParcelFileDescriptor, long, long, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.Res/AssetManager.xml b/docs/Mono.Android/en/Android.Content.Res/AssetManager.xml
index 2c5cbee064..4be50f1a46 100644
--- a/docs/Mono.Android/en/Android.Content.Res/AssetManager.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/AssetManager.xml
@@ -306,14 +306,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="accessMode">Desired access mode for retrieving the data.</param>
         <param name="fileName">The name of the asset to open.  This name can be hierarchical.</param>
-        <summary>Open an asset using ACCESS_STREAMING mode.</summary>
+        <param name="accessMode">Desired access mode for retrieving the data.</param>
+        <summary>Open an asset using an explicit access mode, returning an InputStream to
+            read its contents.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/AssetManager#open(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.res.AssetManager.open(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/AssetManager#open(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.res.AssetManager.open(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -393,14 +394,13 @@
         <Parameter Name="fileName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="cookie">Identifier of the package to be opened.</param>
         <param name="fileName">Name of the asset to retrieve.</param>
         <summary>Open a non-asset as an asset by mmapping it and returning an <c>AssetFileDescriptor</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/AssetManager#openNonAssetFd(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.res.AssetManager.openNonAssetFd(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/AssetManager#openNonAssetFd(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.res.AssetManager.openNonAssetFd(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -480,14 +480,13 @@
         <Parameter Name="fileName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="cookie">Identifier of the package to be opened.</param>
         <param name="fileName">The name of the file to retrieve.</param>
         <summary>Retrieve a parser for a compiled XML file.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/AssetManager#openXmlResourceParser(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.res.AssetManager.openXmlResourceParser(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/AssetManager#openXmlResourceParser(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.res.AssetManager.openXmlResourceParser(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.Res/ColorStateList.xml b/docs/Mono.Android/en/Android.Content.Res/ColorStateList.xml
index 5505a2c035..7eb2dded72 100644
--- a/docs/Mono.Android/en/Android.Content.Res/ColorStateList.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/ColorStateList.xml
@@ -70,13 +70,12 @@
       <Docs>
         <param name="states">To be added.</param>
         <param name="colors">To be added.</param>
-        <param name="orig">the source color state list</param>
-        <summary>Creates a ColorStateList with the same properties as another
-            ColorStateList.</summary>
+        <summary>Creates a ColorStateList that returns the specified mapping from
+            states to colors.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/ColorStateList#ColorStateList(android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.content.res.ColorStateList.ColorStateList(android.content.res.ColorStateList)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/ColorStateList#ColorStateList(int[][],%20int[])" title="Reference documentation">Java documentation for <code>android.content.res.ColorStateList.ColorStateList(int[][], int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -223,9 +222,9 @@
         <Parameter Name="theme" Type="Android.Content.Res.Resources+Theme" />
       </Parameters>
       <Docs>
-        <param name="theme">To be added.</param>
         <param name="r">Resources against which the ColorStateList should be inflated.</param>
         <param name="parser">Parser for the XML document defining the ColorStateList.</param>
+        <param name="theme">To be added.</param>
         <summary>Creates a ColorStateList from an XML document.</summary>
         <returns>A new color state list.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Content.Res/Configuration.xml b/docs/Mono.Android/en/Android.Content.Res/Configuration.xml
index a4aa4e1380..e5ee377f63 100644
--- a/docs/Mono.Android/en/Android.Content.Res/Configuration.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/Configuration.xml
@@ -105,11 +105,11 @@
       </Parameters>
       <Docs>
         <param name="o">To be added.</param>
-        <summary>Construct an invalid Configuration.</summary>
+        <summary>Makes a deep copy suitable for modification.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/Configuration#Configuration()" title="Reference documentation">Java documentation for <code>android.content.res.Configuration.Configuration()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/Configuration#Configuration(android.content.res.Configuration)" title="Reference documentation">Java documentation for <code>android.content.res.Configuration.Configuration(android.content.res.Configuration)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.Res/Resources.xml b/docs/Mono.Android/en/Android.Content.Res/Resources.xml
index 0744e2fb17..53c19b1eef 100644
--- a/docs/Mono.Android/en/Android.Content.Res/Resources.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/Resources.xml
@@ -83,14 +83,17 @@
         <Parameter Name="config" Type="Android.Content.Res.Configuration" />
       </Parameters>
       <Docs>
-        <param name="assets">To be added.</param>
-        <param name="metrics">To be added.</param>
-        <param name="config">To be added.</param>
-        <summary>Only for creating the System resources.</summary>
+        <param name="assets">Previously created AssetManager.</param>
+        <param name="metrics">Current display metrics to consider when
+                           selecting/computing resource values.</param>
+        <param name="config">Desired device configuration to consider when
+                          selecting/computing resource values (optional).</param>
+        <summary>Create a new Resources object on top of an existing set of assets in an
+            AssetManager.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/Resources#Resources()" title="Reference documentation">Java documentation for <code>android.content.res.Resources.Resources()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/Resources#Resources(android.content.res.AssetManager,%20android.util.DisplayMetrics,%20android.content.res.Configuration)" title="Reference documentation">Java documentation for <code>android.content.res.Resources.Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration)</code>.</a>
             </format>
           </para>
           <para>
@@ -542,10 +545,10 @@
         <Parameter Name="theme" Type="Android.Content.Res.Resources+Theme" />
       </Parameters>
       <Docs>
-        <param name="theme">To be added.</param>
         <param name="id">The desired resource identifier, as generated by the aapt
                       tool. This integer encodes the package, type, and resource
                       entry. The value 0 is an invalid identifier.</param>
+        <param name="theme">To be added.</param>
         <summary>Returns a color integer associated with a particular resource ID.</summary>
         <returns>A single color value in the form 0xAARRGGBB.</returns>
         <remarks>
@@ -637,11 +640,11 @@
         <Parameter Name="theme" Type="Android.Content.Res.Resources+Theme" />
       </Parameters>
       <Docs>
-        <param name="theme">To be added.</param>
         <param name="id">The desired resource identifier of a <c>ColorStateList</c>,
                       as generated by the aapt tool. This integer encodes the
                       package, type, and resource entry. The value 0 is an invalid
                       identifier.</param>
+        <param name="theme">To be added.</param>
         <summary>Returns a color state list associated with a particular resource ID.</summary>
         <returns>A ColorStateList object containing either a single solid color
                     or multiple colors that can be selected based on a state.</returns>
@@ -875,10 +878,10 @@
         <Parameter Name="theme" Type="Android.Content.Res.Resources+Theme" />
       </Parameters>
       <Docs>
-        <param name="theme">The theme used to style the drawable attributes, may be <c>null</c>.</param>
         <param name="id">The desired resource identifier, as generated by the aapt
                       tool. This integer encodes the package, type, and resource
                       entry. The value 0 is an invalid identifier.</param>
+        <param name="theme">The theme used to style the drawable attributes, may be <c>null</c>.</param>
         <summary>Return a drawable object associated with a particular resource ID.</summary>
         <returns>Drawable An object that can be used to draw this resource.</returns>
         <remarks>
@@ -979,7 +982,6 @@
         <Parameter Name="theme" Type="Android.Content.Res.Resources+Theme" />
       </Parameters>
       <Docs>
-        <param name="theme">The theme used to style the drawable attributes, may be <c>null</c>.</param>
         <param name="id">The desired resource identifier, as generated by the aapt tool.
                        This integer encodes the package, type, and resource entry.
                        The value 0 is an invalid identifier.</param>
@@ -987,6 +989,7 @@
                        found in <c>DisplayMetrics</c>. A value of 0 means to use the
                        density returned from <c>#getConfiguration()</c>.
                        This is equivalent to calling <c>#getDrawable(int)</c>.</param>
+        <param name="theme">The theme used to style the drawable attributes, may be <c>null</c>.</param>
         <summary>Return a drawable object associated with a particular resource ID for the
             given screen density in DPI.</summary>
         <returns>Drawable An object that can be used to draw this resource.</returns>
@@ -1449,12 +1452,12 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="formatArgs">To be added.</param>
         <param name="id">The desired resource identifier, as generated by the aapt
                       tool. This integer encodes the package, type, and resource
                       entry. The value 0 is an invalid identifier.</param>
         <param name="quantity">The number used to get the correct string for the current language's
                       plural rules.</param>
+        <param name="formatArgs">To be added.</param>
         <summary>Returns the string necessary for grammatically correct pluralization
             of the given resource ID for the given quantity.</summary>
         <returns>String The string data associated with the resource,
@@ -1902,12 +1905,24 @@
         <Parameter Name="def" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="id">To be added.</param>
-        <param name="def">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="id">The desired resource identifier, as generated by the aapt
+                      tool. This integer encodes the package, type, and resource
+                      entry. The value 0 is an invalid identifier.</param>
+        <param name="def">The default CharSequence to return.</param>
+        <summary>Return the string value associated with a particular resource ID.</summary>
+        <returns>CharSequence The string data associated with the resource, plus
+                    possibly styled text information, or def if id is 0 or not found.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/res/Resources#getText(int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.content.res.Resources.getText(int, java.lang.CharSequence)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -2051,13 +2066,23 @@
       </Parameters>
       <Docs>
         <param name="id">The desired resource identifier, as generated by the aapt
-           tool. This integer encodes the package, type, and resource
-           entry. The value 0 is an invalid identifier.</param>
+                      tool. This integer encodes the package, type, and resource
+                      entry. The value 0 is an invalid identifier.</param>
         <param name="def">The default CharSequence to return.</param>
         <summary>Return the string value associated with a particular resource ID.</summary>
-        <returns>To be added.</returns>
+        <returns>CharSequence The string data associated with the resource, plus
+                    possibly styled text information, or def if id is 0 or not found.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/res/Resources#getText(int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.content.res.Resources.getText(int, java.lang.CharSequence)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -2140,10 +2165,7 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the desired resource.  This is passed to
-             getIdentifier() with a default type of "string".</param>
-        <param name="id">The desired resource identifier, as generated by the aapt
-                      tool. This integer encodes the package, type, and resource
-                      entry. The value 0 is an invalid identifier.</param>
+                        getIdentifier() with a default type of "string".</param>
         <param name="outValue">Object in which to place the resource data.</param>
         <param name="resolveRefs">If true, a resource that is a reference to another
                                resource will be followed so that you receive the
@@ -2153,7 +2175,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/Resources#getValue(int,%20android.util.TypedValue,%20boolean)" title="Reference documentation">Java documentation for <code>android.content.res.Resources.getValue(int, android.util.TypedValue, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/Resources#getValue(java.lang.String,%20android.util.TypedValue,%20boolean)" title="Reference documentation">Java documentation for <code>android.content.res.Resources.getValue(java.lang.String, android.util.TypedValue, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -2397,12 +2419,24 @@
       </Parameters>
       <Docs>
         <param name="set">The current attribute values to retrieve.</param>
-        <param name="attrs">The specific attributes to be retrieved.</param>
+        <param name="attrs">The specific attributes to be retrieved. These attribute IDs must be sorted in
+                         ascending order.</param>
         <summary>Retrieve a set of basic attribute values from an AttributeSet, not
- performing styling of them using a theme and/or style resources.</summary>
-        <returns>To be added.</returns>
+            performing styling of them using a theme and/or style resources.</summary>
+        <returns>Returns a TypedArray holding an array of the attribute values.
+            Be sure to call <c>TypedArray#recycle() TypedArray.recycle()</c>
+            when done with it.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/res/Resources#obtainAttributes(android.util.AttributeSet,%20int[])" title="Reference documentation">Java documentation for <code>android.content.res.Resources.obtainAttributes(android.util.AttributeSet, int[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -2521,14 +2555,14 @@
         <Parameter Name="value" Type="Android.Util.TypedValue" />
       </Parameters>
       <Docs>
-        <param name="value">The TypedValue object to hold the resource information.</param>
         <param name="id">The resource identifier to open, as generated by the aapt tool.</param>
+        <param name="value">The TypedValue object to hold the resource information.</param>
         <summary>Open a data stream for reading a raw resource.</summary>
         <returns>InputStream Access to the resource data.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/Resources#openRawResource(int)" title="Reference documentation">Java documentation for <code>android.content.res.Resources.openRawResource(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/Resources#openRawResource(int,%20android.util.TypedValue)" title="Reference documentation">Java documentation for <code>android.content.res.Resources.openRawResource(int, android.util.TypedValue)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content.Res/TypedArray.xml b/docs/Mono.Android/en/Android.Content.Res/TypedArray.xml
index 09690d3147..a0189f6d26 100644
--- a/docs/Mono.Android/en/Android.Content.Res/TypedArray.xml
+++ b/docs/Mono.Android/en/Android.Content.Res/TypedArray.xml
@@ -846,10 +846,8 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">Textual name of attribute for error reporting.</param>
         <param name="index">Index of the attribute to retrieve.</param>
-        <param name="defValue">The default value to return if this attribute is not
-                            default or contains the wrong type of data.</param>
+        <param name="name">Textual name of attribute for error reporting.</param>
         <summary>Special version of <c>#getDimensionPixelSize</c> for retrieving
             <c>android.view.ViewGroup</c>'s layout_width and layout_height
             attributes.</summary>
@@ -858,7 +856,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/res/TypedArray#getLayoutDimension(int,%20int)" title="Reference documentation">Java documentation for <code>android.content.res.TypedArray.getLayoutDimension(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/res/TypedArray#getLayoutDimension(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.res.TypedArray.getLayoutDimension(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/AbstractThreadedSyncAdapter.xml b/docs/Mono.Android/en/Android.Content/AbstractThreadedSyncAdapter.xml
index 068e5e2988..dfc8806646 100644
--- a/docs/Mono.Android/en/Android.Content/AbstractThreadedSyncAdapter.xml
+++ b/docs/Mono.Android/en/Android.Content/AbstractThreadedSyncAdapter.xml
@@ -375,13 +375,12 @@
         <Parameter Name="thread" Type="Java.Lang.Thread" />
       </Parameters>
       <Docs>
-        <param name="thread">the Thread of the sync that is to be canceled.
-</param>
+        <param name="thread">the Thread of the sync that is to be canceled.</param>
         <summary>Indicates that a sync operation has been canceled.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter#onSyncCanceled()" title="Reference documentation">Java documentation for <code>android.content.AbstractThreadedSyncAdapter.onSyncCanceled()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter#onSyncCanceled(java.lang.Thread)" title="Reference documentation">Java documentation for <code>android.content.AbstractThreadedSyncAdapter.onSyncCanceled(java.lang.Thread)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/ClipData.xml b/docs/Mono.Android/en/Android.Content/ClipData.xml
index 5e1ed2af6b..4c6f43ed89 100644
--- a/docs/Mono.Android/en/Android.Content/ClipData.xml
+++ b/docs/Mono.Android/en/Android.Content/ClipData.xml
@@ -103,7 +103,6 @@
       <Docs>
         <param name="description">To be added.</param>
         <param name="item">To be added.</param>
-        <param name="other">The existing ClipData that is to be copied.</param>
         <summary>Create a new clip that is a copy of another clip.</summary>
         <remarks>
           <para>
@@ -168,7 +167,6 @@
         <param name="label">To be added.</param>
         <param name="mimeTypes">To be added.</param>
         <param name="item">To be added.</param>
-        <param name="other">The existing ClipData that is to be copied.</param>
         <summary>Create a new clip that is a copy of another clip.</summary>
         <remarks>
           <para>
@@ -240,8 +238,6 @@
         <Parameter Name="item" Type="Android.Content.ClipData+Item" />
       </Parameters>
       <Docs>
-        <param name="resolver">ContentResolver used to get information about the URI possibly contained in
-            the item.</param>
         <param name="item">Item to be added.</param>
         <summary>Add a new Item to the overall ClipData container.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Content/ClipDescription.xml b/docs/Mono.Android/en/Android.Content/ClipDescription.xml
index e48b90dd46..76ff39a187 100644
--- a/docs/Mono.Android/en/Android.Content/ClipDescription.xml
+++ b/docs/Mono.Android/en/Android.Content/ClipDescription.xml
@@ -105,13 +105,13 @@
         <Parameter Name="mimeTypes" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="label">To be added.</param>
-        <param name="mimeTypes">To be added.</param>
-        <summary>Create a copy of a ClipDescription.</summary>
+        <param name="label">Label to show to the user describing this clip.</param>
+        <param name="mimeTypes">An array of MIME types this data is available as.</param>
+        <summary>Create a new clip.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ClipDescription#ClipDescription(android.content.ClipDescription)" title="Reference documentation">Java documentation for <code>android.content.ClipDescription.ClipDescription(android.content.ClipDescription)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ClipDescription#ClipDescription(java.lang.CharSequence,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.ClipDescription.ClipDescription(java.lang.CharSequence, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/ComponentName.xml b/docs/Mono.Android/en/Android.Content/ComponentName.xml
index 671df87eba..03d2e553a3 100644
--- a/docs/Mono.Android/en/Android.Content/ComponentName.xml
+++ b/docs/Mono.Android/en/Android.Content/ComponentName.xml
@@ -76,16 +76,14 @@
         <Parameter Name="in" Type="Android.OS.Parcel" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
-        <param name="pkg">A Context for the package implementing the component, from
-            which the actual package name will be retrieved.</param>
-        <param name="cls">The Class object of the desired component, from which the
-            actual class name will be retrieved.</param>
-        <summary>Create a new component identifier from a Context and Class object.</summary>
+        <param name="in">The Parcel containing the previously written ComponentName,
+            positioned at the location in the buffer where it was written.</param>
+        <summary>Instantiate a new ComponentName from the data in a Parcel that was
+            previously written with <c>#writeToParcel(Parcel, int)</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ComponentName#ComponentName(android.content.Context,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.ComponentName(android.content.Context, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ComponentName#ComponentName(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.ComponentName(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -158,15 +156,15 @@
         <Parameter Name="cls" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pkg">A Context for the package implementing the component, from
-            which the actual package name will be retrieved.</param>
-        <param name="cls">The Class object of the desired component, from which the
-            actual class name will be retrieved.</param>
-        <summary>Create a new component identifier from a Context and Class object.</summary>
+        <param name="pkg">A Context for the package implementing the component,
+            from which the actual package name will be retrieved.</param>
+        <param name="cls">The name of the class inside of &lt;var&gt;pkg&lt;/var&gt; that
+            implements the component.</param>
+        <summary>Create a new component identifier from a Context and class name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ComponentName#ComponentName(android.content.Context,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.ComponentName(android.content.Context, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ComponentName#ComponentName(android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.ComponentName(android.content.Context, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -199,15 +197,15 @@
         <Parameter Name="cls" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pkg">A Context for the package implementing the component, from
-            which the actual package name will be retrieved.</param>
-        <param name="cls">The Class object of the desired component, from which the
-            actual class name will be retrieved.</param>
-        <summary>Create a new component identifier from a Context and Class object.</summary>
+        <param name="pkg">The name of the package that the component exists in.  Can
+            not be null.</param>
+        <param name="cls">The name of the class inside of &lt;var&gt;pkg&lt;/var&gt; that
+            implements the component.  Can not be null.</param>
+        <summary>Create a new component identifier.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ComponentName#ComponentName(android.content.Context,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.ComponentName(android.content.Context, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ComponentName#ComponentName(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.ComponentName(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -386,7 +384,7 @@
         <Parameter Name="cls" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pkg">a Context for the package implementing the component</param>
+        <param name="pkg">the name of the package the component exists in</param>
         <param name="cls">the name of the class inside of &lt;var&gt;pkg&lt;/var&gt; that implements
                        the component</param>
         <summary>Create a new component identifier where the class name may be specified
@@ -395,7 +393,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ComponentName#createRelative(android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.createRelative(android.content.Context, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ComponentName#createRelative(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ComponentName.createRelative(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -956,11 +954,10 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="out">The Parcel in which the ComponentName will be placed.</param>
         <param name="flags">Additional flags about how the object should be written.
  May be 0 or <see cref="F:Android.OS.Parcelable.ParcelableWriteReturnValue" />.
 </param>
-        <param name="c">The ComponentName to be written.</param>
-        <param name="out">The Parcel in which the ComponentName will be placed.</param>
         <summary>Write a ComponentName to a Parcel, handling null pointers.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/ContentProvider.xml b/docs/Mono.Android/en/Android.Content/ContentProvider.xml
index e9b860012c..b5c7c8d5c2 100644
--- a/docs/Mono.Android/en/Android.Content/ContentProvider.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentProvider.xml
@@ -987,15 +987,19 @@
         <Parameter Name="extras" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="extras">To be added.</param>
         <param name="uri">The content:// URI of the insertion request.</param>
         <param name="values">A set of column_name/value pairs to add to the database.</param>
+        <param name="extras">A Bundle containing additional information necessary for
+                       the operation. Arguments may include SQL style arguments, such
+                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
+                       the documentation for each individual provider will indicate
+                       which arguments they support.</param>
         <summary>Implement this to handle requests to insert a new row.</summary>
         <returns>The URI for the newly inserted item.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProvider#insert(android.net.Uri,%20android.content.ContentValues)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.insert(android.net.Uri, android.content.ContentValues)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProvider#insert(android.net.Uri,%20android.content.ContentValues,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.insert(android.net.Uri, android.content.ContentValues, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1368,15 +1372,15 @@
         <Parameter Name="signal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="signal">A signal to cancel the operation in progress, or
-            <c>null</c> if none. For example, if you are downloading a
-            file from the network to service a "rw" mode request, you
-            should periodically call
-            <see cref="M:Android.OS.CancellationSignal.ThrowIfCanceled" /> to check whether
-            the client has canceled the request and abort the download.</param>
         <param name="uri">The URI whose file is to be opened.</param>
         <param name="mode">The string representation of the file mode. Can be "r", "w", "wt", "wa", "rw"
                         or "rwt". See<c>ParcelFileDescriptor#parseMode</c> for more details.</param>
+        <param name="signal">A signal to cancel the operation in progress, or
+                       <c>null</c> if none. For example, if you are downloading a
+                       file from the network to service a "rw" mode request, you
+                       should periodically call
+                       <c>CancellationSignal#throwIfCanceled()</c> to check whether
+                       the client has canceled the request and abort the download.</param>
         <summary>This is like <c>#openFile</c>, but can be implemented by providers
             that need to be able to return sub-sections of files, often assets
             inside of their .</summary>
@@ -1385,7 +1389,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProvider#openAssetFile(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.openAssetFile(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProvider#openAssetFile(android.net.Uri,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1481,22 +1485,22 @@
         <Parameter Name="signal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="signal">A signal to cancel the operation in progress, or
-            <c>null</c> if none. For example, if you are downloading a
-            file from the network to service a "rw" mode request, you
-            should periodically call
-            <see cref="M:Android.OS.CancellationSignal.ThrowIfCanceled" /> to check whether
-            the client has canceled the request and abort the download.</param>
         <param name="uri">The URI whose file is to be opened.</param>
         <param name="mode">The string representation of the file mode. Can be "r", "w", "wt", "wa", "rw"
                         or "rwt". See<c>ParcelFileDescriptor#parseMode</c> for more details.</param>
+        <param name="signal">A signal to cancel the operation in progress, or
+                       <c>null</c> if none. For example, if you are downloading a
+                       file from the network to service a "rw" mode request, you
+                       should periodically call
+                       <c>CancellationSignal#throwIfCanceled()</c> to check whether
+                       the client has canceled the request and abort the download.</param>
         <summary>Override this to handle requests to open a file blob.</summary>
         <returns>Returns a new ParcelFileDescriptor which you can use to access
             the file.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProvider#openFile(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.openFile(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProvider#openFile(android.net.Uri,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.openFile(android.net.Uri, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1705,12 +1709,6 @@
         <Parameter Name="signal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="signal">A signal to cancel the operation in progress, or
-            <c>null</c> if none. For example, if you are downloading a
-            file from the network to service a "rw" mode request, you
-            should periodically call
-            <see cref="M:Android.OS.CancellationSignal.ThrowIfCanceled" /> to check whether
-            the client has canceled the request and abort the download.</param>
         <param name="uri">The data in the content provider being queried.</param>
         <param name="mimeTypeFilter">The type of data the client desires.  May be
             a pattern, such as *&amp;#47;*, if the caller does not have specific type
@@ -1718,6 +1716,12 @@
             type matching the pattern.</param>
         <param name="opts">Additional options from the client.  The definitions of
             these are specific to the content provider being called.</param>
+        <param name="signal">A signal to cancel the operation in progress, or
+                       <c>null</c> if none. For example, if you are downloading a
+                       file from the network to service a "rw" mode request, you
+                       should periodically call
+                       <c>CancellationSignal#throwIfCanceled()</c> to check whether
+                       the client has canceled the request and abort the download.</param>
         <summary>Called by a client to open a read-only stream containing data of a
             particular MIME type.</summary>
         <returns>Returns a new AssetFileDescriptor from which the client can
@@ -1725,7 +1729,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProvider#openTypedAssetFile(android.net.Uri,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProvider#openTypedAssetFile(android.net.Uri,%20java.lang.String,%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1824,29 +1828,25 @@
         <Parameter Name="sortOrder" Type="System.String" />
       </Parameters>
       <Docs>
+        <param name="uri">The URI to query. This will be the full URI sent by the client;
+                 if the client is requesting a specific record, the URI will end in a record number
+                 that the implementation should parse and add to a WHERE or HAVING clause, specifying
+                 that _id value.</param>
+        <param name="projection">The list of columns to put into the cursor. If
+                 <c>null</c> all columns are included.</param>
         <param name="selection">A selection criteria to apply when filtering rows.
-      If <c>null</c> then all rows are included.</param>
+                 If <c>null</c> then all rows are included.</param>
         <param name="selectionArgs">You may include ?s in selection, which will be replaced by
-      the values from selectionArgs, in order that they appear in the selection.
-      The values will be bound as Strings.</param>
+                 the values from selectionArgs, in order that they appear in the selection.
+                 The values will be bound as Strings.</param>
         <param name="sortOrder">How the rows in the cursor should be sorted.
-      If <c>null</c> then the provider is free to define the sort order.</param>
-        <param name="uri">The URI to query. This will be the full URI sent by the client.</param>
-        <param name="projection">The list of columns to put into the cursor.
-                       If <c>null</c> provide a default set of columns.</param>
-        <param name="queryArgs">A Bundle containing additional information necessary for
-                       the operation. Arguments may include SQL style arguments, such
-                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
-                       the documentation for each individual provider will indicate
-                       which arguments they support.</param>
-        <param name="cancellationSignal">A signal to cancel the operation in progress,
-                       or <c>null</c>.</param>
-        <summary>Implement this to handle query requests where the arguments are packed into a <c>Bundle</c>.</summary>
+                 If <c>null</c> then the provider is free to define the sort order.</param>
+        <summary>Implement this to handle query requests from clients.</summary>
         <returns>a Cursor or <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProvider#query(android.net.Uri,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProvider#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1886,29 +1886,28 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
+        <param name="uri">The URI to query. This will be the full URI sent by the client;
+                 if the client is requesting a specific record, the URI will end in a record number
+                 that the implementation should parse and add to a WHERE or HAVING clause, specifying
+                 that _id value.</param>
+        <param name="projection">The list of columns to put into the cursor. If
+                 <c>null</c> all columns are included.</param>
         <param name="selection">A selection criteria to apply when filtering rows.
-      If <c>null</c> then all rows are included.</param>
+                 If <c>null</c> then all rows are included.</param>
         <param name="selectionArgs">You may include ?s in selection, which will be replaced by
-      the values from selectionArgs, in order that they appear in the selection.
-      The values will be bound as Strings.</param>
+                 the values from selectionArgs, in order that they appear in the selection.
+                 The values will be bound as Strings.</param>
         <param name="sortOrder">How the rows in the cursor should be sorted.
-      If <c>null</c> then the provider is free to define the sort order.</param>
-        <param name="uri">The URI to query. This will be the full URI sent by the client.</param>
-        <param name="projection">The list of columns to put into the cursor.
-                       If <c>null</c> provide a default set of columns.</param>
-        <param name="queryArgs">A Bundle containing additional information necessary for
-                       the operation. Arguments may include SQL style arguments, such
-                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
-                       the documentation for each individual provider will indicate
-                       which arguments they support.</param>
-        <param name="cancellationSignal">A signal to cancel the operation in progress,
-                       or <c>null</c>.</param>
-        <summary>Implement this to handle query requests where the arguments are packed into a <c>Bundle</c>.</summary>
+                 If <c>null</c> then the provider is free to define the sort order.</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress, or <c>null</c> if none.
+            If the operation is canceled, then <c>android.os.OperationCanceledException</c> will be thrown
+            when the query is executed.</param>
+        <summary>Implement this to handle query requests from clients with support for cancellation.</summary>
         <returns>a Cursor or <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProvider#query(android.net.Uri,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProvider#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -2405,22 +2404,17 @@
         <Parameter Name="selectionArgs" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="selection">An optional filter to match rows to update.</param>
         <param name="selectionArgs">To be added.</param>
         <param name="uri">The URI to query. This can potentially have a record ID if
                        this is an update request for a specific record.</param>
         <param name="values">A set of column_name/value pairs to update in the database.</param>
-        <param name="extras">A Bundle containing additional information necessary for
-                       the operation. Arguments may include SQL style arguments, such
-                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
-                       the documentation for each individual provider will indicate
-                       which arguments they support.</param>
+        <param name="selection">An optional filter to match rows to update.</param>
         <summary>Implement this to handle requests to update one or more rows.</summary>
         <returns>the number of rows affected.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProvider#update(android.net.Uri,%20android.content.ContentValues,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.update(android.net.Uri, android.content.ContentValues, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProvider#update(android.net.Uri,%20android.content.ContentValues,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.ContentProvider.update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/ContentProviderClient.xml b/docs/Mono.Android/en/Android.Content/ContentProviderClient.xml
index dd6c27befc..24ce0252c7 100644
--- a/docs/Mono.Android/en/Android.Content/ContentProviderClient.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentProviderClient.xml
@@ -100,7 +100,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#applyBatch(java.lang.String,%20java.util.ArrayList)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.applyBatch(java.lang.String, java.util.ArrayList)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#applyBatch(java.util.ArrayList)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.applyBatch(java.util.ArrayList)</code>.</a>
             </format>
           </para>
           <para>
@@ -278,7 +278,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#call(java.lang.String,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.call(java.lang.String, java.lang.String, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#call(java.lang.String,%20java.lang.String,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.call(java.lang.String, java.lang.String, java.lang.String, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -446,7 +446,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#delete(android.net.Uri,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.delete(android.net.Uri, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#delete(android.net.Uri,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.delete(android.net.Uri, java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -622,7 +622,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#insert(android.net.Uri,%20android.content.ContentValues)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.insert(android.net.Uri, android.content.ContentValues)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#insert(android.net.Uri,%20android.content.ContentValues,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.insert(android.net.Uri, android.content.ContentValues, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -784,7 +784,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#openAssetFile(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.openAssetFile(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#openAssetFile(android.net.Uri,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -875,7 +875,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#openFile(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.openFile(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#openFile(android.net.Uri,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.openFile(android.net.Uri, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1005,7 +1005,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#openTypedAssetFileDescriptor(android.net.Uri,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#openTypedAssetFileDescriptor(android.net.Uri,%20java.lang.String,%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1101,7 +1101,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#query(android.net.Uri,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1153,7 +1153,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#query(android.net.Uri,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1435,7 +1435,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#update(android.net.Uri,%20android.content.ContentValues,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.update(android.net.Uri, android.content.ContentValues, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentProviderClient#update(android.net.Uri,%20android.content.ContentValues,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.ContentProviderClient.update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/ContentProviderOperation.xml b/docs/Mono.Android/en/Android.Content/ContentProviderOperation.xml
index 3ae6800d09..a49d67313d 100644
--- a/docs/Mono.Android/en/Android.Content/ContentProviderOperation.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentProviderOperation.xml
@@ -621,9 +621,9 @@
         <Parameter Name="arg" Type="System.String" />
       </Parameters>
       <Docs>
+        <param name="uri">The <c>Uri</c> that is the target of the operation.</param>
         <param name="method">To be added.</param>
         <param name="arg">To be added.</param>
-        <param name="uri">The <c>Uri</c> that is the target of the operation.</param>
         <summary>Create a <c>Builder</c> suitable for building an operation that will
             invoke <c>ContentProvider#call</c>.</summary>
         <returns>To be added.</returns>
diff --git a/docs/Mono.Android/en/Android.Content/ContentResolver.xml b/docs/Mono.Android/en/Android.Content/ContentResolver.xml
index e31c3887fe..405ca98108 100644
--- a/docs/Mono.Android/en/Android.Content/ContentResolver.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentResolver.xml
@@ -162,15 +162,14 @@
       </Parameters>
       <Docs>
         <param name="name">specifies which provider should be acquired</param>
-        <param name="uri">specifies which provider should be acquired</param>
         <summary>Returns a <c>ContentProviderClient</c> that is associated with the <c>ContentProvider</c>
-            that services the content at uri, starting the provider if necessary.</summary>
+            with the authority of name, starting the provider if necessary.</summary>
         <returns>a <c>ContentProviderClient</c> that is associated with the <c>ContentProvider</c>
-            that services the content at uri or null if there isn't one.</returns>
+            with the authority of name or null if there isn't one.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#acquireContentProviderClient(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.acquireContentProviderClient(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#acquireContentProviderClient(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.acquireContentProviderClient(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -248,13 +247,13 @@
       </Parameters>
       <Docs>
         <param name="name">To be added.</param>
-        <summary>Like <c>#acquireContentProviderClient(Uri)</c>, but for use when you do
+        <summary>Like <c>#acquireContentProviderClient(String)</c>, but for use when you do
             not trust the stability of the target content provider.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#acquireUnstableContentProviderClient(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.acquireUnstableContentProviderClient(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#acquireUnstableContentProviderClient(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.acquireUnstableContentProviderClient(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -614,15 +613,12 @@
         <Parameter Name="request" Type="Android.Content.SyncRequest" />
       </Parameters>
       <Docs>
-        <param name="request">SyncRequest object containing information about sync to cancel.
-</param>
-        <param name="account">filters the syncs that match by this account</param>
-        <param name="authority">filters the syncs that match by this authority</param>
-        <summary>Cancel any active or pending syncs that match account and authority.</summary>
+        <param name="request">SyncRequest object containing information about sync to cancel.</param>
+        <summary>Remove the specified sync.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#cancelSync(android.accounts.Account,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.cancelSync(android.accounts.Account, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#cancelSync(android.content.SyncRequest)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.cancelSync(android.content.SyncRequest)</code>.</a>
             </format>
           </para>
           <para>
@@ -661,13 +657,11 @@
       </Parameters>
       <Docs>
         <param name="uri">the uri of the provider to sync or null to sync all providers.</param>
-        <param name="account">filters the syncs that match by this account</param>
-        <param name="authority">filters the syncs that match by this authority</param>
-        <summary>Cancel any active or pending syncs that match account and authority.</summary>
+        <summary>Cancel any active or pending syncs that match the Uri.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#cancelSync(android.accounts.Account,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.cancelSync(android.accounts.Account, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#cancelSync(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.cancelSync(android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -992,21 +986,16 @@
         <Parameter Name="selectionArgs" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="where">A filter to apply to rows before deleting, formatted as an SQL WHERE clause
-                    (excluding the WHERE itself).</param>
         <param name="selectionArgs">To be added.</param>
         <param name="url">The URL of the row to delete.</param>
-        <param name="extras">A Bundle containing additional information necessary for
-                       the operation. Arguments may include SQL style arguments, such
-                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
-                       the documentation for each individual provider will indicate
-                       which arguments they support.</param>
+        <param name="where">A filter to apply to rows before deleting, formatted as an SQL WHERE clause
+                                (excluding the WHERE itself).</param>
         <summary>Deletes row(s) specified by a content URI.</summary>
         <returns>The number of rows deleted.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#delete(android.net.Uri,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.delete(android.net.Uri, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#delete(android.net.Uri,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.delete(android.net.Uri, java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1524,17 +1513,21 @@
         <Parameter Name="extras" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="extras">To be added.</param>
         <param name="url">The URL of the table to insert into.</param>
         <param name="values">The initial values for the newly inserted row. The key is the column name for
                           the field. Passing an empty ContentValues will create an empty row.</param>
+        <param name="extras">A Bundle containing additional information necessary for
+                       the operation. Arguments may include SQL style arguments, such
+                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
+                       the documentation for each individual provider will indicate
+                       which arguments they support.</param>
         <summary>Inserts a row into a table at the given URL.</summary>
         <returns>the URL of the newly created row. May return &lt;code&gt;null&lt;/code&gt; if the underlying
                     content provider returns &lt;code&gt;null&lt;/code&gt;, or if it crashes.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#insert(android.net.Uri,%20android.content.ContentValues)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.insert(android.net.Uri, android.content.ContentValues)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#insert(android.net.Uri,%20android.content.ContentValues,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.insert(android.net.Uri, android.content.ContentValues, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -1688,12 +1681,26 @@
         <Parameter Name="signal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="size">To be added.</param>
-        <param name="signal">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="uri">The item that should be visualized as a thumbnail.</param>
+        <param name="size">The target area on the screen where this thumbnail will be
+                       shown. This is passed to the provider as <c>#EXTRA_SIZE</c>
+                       to help it avoid downloading or generating heavy resources.</param>
+        <param name="signal">A signal to cancel the operation in progress.</param>
+        <summary>Convenience method that efficiently loads a visual thumbnail for the
+            given <c>Uri</c>.</summary>
+        <returns>Valid <c>Bitmap</c> which is a visual thumbnail.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#loadThumbnail(android.net.Uri,%20android.util.Size,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.loadThumbnail(android.net.Uri, android.util.Size, android.os.CancellationSignal)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="MasterSyncAutomatically">
@@ -1825,7 +1832,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
         <param name="uri">The uri of the content that was changed.</param>
         <param name="observer">The observer that originated the change, may be
                        &lt;code&gt;null&lt;/null&gt;. The observer that originated the change
@@ -1833,12 +1839,12 @@
                        receive self-change notifications by implementing
                        <c>ContentObserver#deliverSelfNotifications()</c> to return
                        true.</param>
-        <summary>Notify registered observers that a row was updated and attempt to sync
-            changes to the network.</summary>
+        <param name="flags">Additional flags: <c>#NOTIFY_SYNC_TO_NETWORK</c>.</param>
+        <summary>Notify registered observers that a row was updated.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#notifyChange(android.net.Uri,%20android.database.ContentObserver)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.notifyChange(android.net.Uri, android.database.ContentObserver)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#notifyChange(android.net.Uri,%20android.database.ContentObserver,%20int)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.notifyChange(android.net.Uri, android.database.ContentObserver, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1878,7 +1884,6 @@
         <Parameter Name="syncToNetwork" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="syncToNetwork">If true, attempt to sync the change to the network.</param>
         <param name="uri">The uri of the content that was changed.</param>
         <param name="observer">The observer that originated the change, may be
                        &lt;code&gt;null&lt;/null&gt;. The observer that originated the change
@@ -1886,12 +1891,12 @@
                        receive self-change notifications by implementing
                        <c>ContentObserver#deliverSelfNotifications()</c> to return
                        true.</param>
-        <summary>Notify registered observers that a row was updated and attempt to sync
-            changes to the network.</summary>
+        <param name="syncToNetwork">If true, same as <c>#NOTIFY_SYNC_TO_NETWORK</c>.</param>
+        <summary>Notify registered observers that a row was updated.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#notifyChange(android.net.Uri,%20android.database.ContentObserver)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.notifyChange(android.net.Uri, android.database.ContentObserver)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#notifyChange(android.net.Uri,%20android.database.ContentObserver,%20boolean)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.notifyChange(android.net.Uri, android.database.ContentObserver, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1936,21 +1941,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="uris">To be added.</param>
-        <param name="flags">To be added.</param>
-        <param name="uri">The uri of the content that was changed.</param>
+        <param name="uris">The uris of the content that was changed.</param>
         <param name="observer">The observer that originated the change, may be
                        &lt;code&gt;null&lt;/null&gt;. The observer that originated the change
                        will only receive the notification if it has requested to
                        receive self-change notifications by implementing
                        <c>ContentObserver#deliverSelfNotifications()</c> to return
                        true.</param>
-        <summary>Notify registered observers that a row was updated and attempt to sync
-            changes to the network.</summary>
+        <param name="flags">Flags such as <c>#NOTIFY_SYNC_TO_NETWORK</c> or
+                       <c>#NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS</c>.</param>
+        <summary>Notify registered observers that several rows have been updated.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#notifyChange(android.net.Uri,%20android.database.ContentObserver)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.notifyChange(android.net.Uri, android.database.ContentObserver)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#notifyChange(java.util.Collection,%20android.database.ContentObserver,%20int)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.notifyChange(java.util.Collection, android.database.ContentObserver, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2277,12 +2281,12 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if
-            none. If the operation is canceled, then
-            <see cref="T:Android.OS.OperationCanceledException" /> will be thrown.</param>
         <param name="uri">The desired URI to open.</param>
         <param name="mode">The string representation of the file mode. Can be "r", "w", "wt", "wa", "rw"
                         or "rwt". See<c>ParcelFileDescriptor#parseMode</c> for more details.</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if
+                       none. If the operation is canceled, then
+                       <c>OperationCanceledException</c> will be thrown.</param>
         <summary>Open a raw file descriptor to access data under a URI.</summary>
         <returns>Returns a new ParcelFileDescriptor pointing to the file or <c>null</c> if the
             provider recently crashed. You own this descriptor and are responsible for closing it
@@ -2290,7 +2294,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#openAssetFileDescriptor(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.openAssetFileDescriptor(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#openAssetFileDescriptor(android.net.Uri,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.openAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -2525,15 +2529,15 @@
         <Parameter Name="mode" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="mode">May be "w", "wa", "rw", or "rwt".</param>
         <param name="uri">The desired URI.</param>
-        <summary>Synonym for <c>#openOutputStream(Uri, String)
-            openOutputStream(uri, "w")</c>.</summary>
+        <param name="mode">The string representation of the file mode. Can be "r", "w", "wt", "wa", "rw"
+                        or "rwt". See<c>ParcelFileDescriptor#parseMode</c> for more details.</param>
+        <summary>Open a stream on to the content associated with a content URI.</summary>
         <returns>an OutputStream or <c>null</c> if the provider recently crashed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#openOutputStream(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.openOutputStream(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#openOutputStream(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.openOutputStream(android.net.Uri, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2664,15 +2668,15 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="cancellationSignal">A signal to cancel the operation in progress,
-         or null if none. If the operation is canceled, then
-         <see cref="T:Android.OS.OperationCanceledException" /> will be thrown.</param>
         <param name="uri">The desired URI to open.</param>
         <param name="mimeType">The desired MIME type of the returned data.  This can
             be a pattern such as *&amp;#47;*, which will allow the content provider to
             select a type, though there is no way for you to determine what type
             it is returning.</param>
         <param name="opts">Additional provider-dependent options.</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress,
+                    or null if none. If the operation is canceled, then
+                    <c>OperationCanceledException</c> will be thrown.</param>
         <summary>Open a raw file descriptor to access (potentially type transformed)
             data from a "content:" URI.</summary>
         <returns>Returns a new ParcelFileDescriptor from which you can read the
@@ -2683,7 +2687,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#openTypedAssetFileDescriptor(android.net.Uri,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#openTypedAssetFileDescriptor(android.net.Uri,%20java.lang.String,%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -2857,36 +2861,27 @@
         <Parameter Name="sortOrder" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="selection">A filter declaring which rows to return, formatted as an
-         SQL WHERE clause (excluding the WHERE itself). Passing null will
-         return all rows for the given URI.</param>
-        <param name="selectionArgs">You may include ?s in selection, which will be
-         replaced by the values from selectionArgs, in the order that they
-         appear in the selection. The values will be bound as Strings.</param>
-        <param name="sortOrder">How to order the rows, formatted as an SQL ORDER BY
-         clause (excluding the ORDER BY itself). Passing null will use the
-         default sort order, which may be unordered.</param>
         <param name="uri">The URI, using the content:// scheme, for the content to
                     retrieve.</param>
         <param name="projection">A list of which columns to return. Passing null will
                     return all columns, which is inefficient.</param>
-        <param name="queryArgs">A Bundle containing additional information necessary for
-                       the operation. Arguments may include SQL style arguments, such
-                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
-                       the documentation for each individual provider will indicate
-                       which arguments they support.</param>
-        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
-            If the operation is canceled, then <c>OperationCanceledException</c> will be thrown
-            when the query is executed.</param>
-        <summary>Query the given URI, returning a <c>Cursor</c> over the result set
-            with support for cancellation.</summary>
+        <param name="selection">A filter declaring which rows to return, formatted as an
+                    SQL WHERE clause (excluding the WHERE itself). Passing null will
+                    return all rows for the given URI.</param>
+        <param name="selectionArgs">You may include ?s in selection, which will be
+                    replaced by the values from selectionArgs, in the order that they
+                    appear in the selection. The values will be bound as Strings.</param>
+        <param name="sortOrder">How to order the rows, formatted as an SQL ORDER BY
+                    clause (excluding the ORDER BY itself). Passing null will use the
+                    default sort order, which may be unordered.</param>
+        <summary>Query the given URI, returning a <c>Cursor</c> over the result set.</summary>
         <returns>A Cursor object, which is positioned before the first entry. May return
                     &lt;code&gt;null&lt;/code&gt; if the underlying content provider returns &lt;code&gt;null&lt;/code&gt;,
                     or if it crashes.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2927,36 +2922,31 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="selection">A filter declaring which rows to return, formatted as an
-         SQL WHERE clause (excluding the WHERE itself). Passing null will
-         return all rows for the given URI.</param>
-        <param name="selectionArgs">You may include ?s in selection, which will be
-         replaced by the values from selectionArgs, in the order that they
-         appear in the selection. The values will be bound as Strings.</param>
-        <param name="sortOrder">How to order the rows, formatted as an SQL ORDER BY
-         clause (excluding the ORDER BY itself). Passing null will use the
-         default sort order, which may be unordered.</param>
         <param name="uri">The URI, using the content:// scheme, for the content to
                     retrieve.</param>
         <param name="projection">A list of which columns to return. Passing null will
                     return all columns, which is inefficient.</param>
-        <param name="queryArgs">A Bundle containing additional information necessary for
-                       the operation. Arguments may include SQL style arguments, such
-                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
-                       the documentation for each individual provider will indicate
-                       which arguments they support.</param>
+        <param name="selection">A filter declaring which rows to return, formatted as an
+                    SQL WHERE clause (excluding the WHERE itself). Passing null will
+                    return all rows for the given URI.</param>
+        <param name="selectionArgs">You may include ?s in selection, which will be
+                    replaced by the values from selectionArgs, in the order that they
+                    appear in the selection. The values will be bound as Strings.</param>
+        <param name="sortOrder">How to order the rows, formatted as an SQL ORDER BY
+                    clause (excluding the ORDER BY itself). Passing null will use the
+                    default sort order, which may be unordered.</param>
         <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
             If the operation is canceled, then <c>OperationCanceledException</c> will be thrown
             when the query is executed.</param>
         <summary>Query the given URI, returning a <c>Cursor</c> over the result set
-            with support for cancellation.</summary>
+            with optional support for cancellation.</summary>
         <returns>A Cursor object, which is positioned before the first entry. May return
                     &lt;code&gt;null&lt;/code&gt; if the underlying content provider returns &lt;code&gt;null&lt;/code&gt;,
                     or if it crashes.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -3759,14 +3749,11 @@
       </Parameters>
       <Docs>
         <param name="request">To be added.</param>
-        <param name="account">which account should be synced</param>
-        <param name="authority">which authority should be synced</param>
-        <param name="extras">any extras to pass to the SyncAdapter.</param>
-        <summary>Start an asynchronous sync operation.</summary>
+        <summary>Register a sync with the SyncManager.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#requestSync(android.accounts.Account,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.requestSync(android.accounts.Account, java.lang.String, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#requestSync(android.content.SyncRequest)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.requestSync(android.content.SyncRequest)</code>.</a>
             </format>
           </para>
           <para>
@@ -4888,23 +4875,18 @@
         <Parameter Name="selectionArgs" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="where">A filter to apply to rows before updating, formatted as an SQL WHERE clause
-                    (excluding the WHERE itself).</param>
         <param name="selectionArgs">To be added.</param>
         <param name="uri">The URI to modify.</param>
         <param name="values">The new field values. The key is the column name for the field.
                                  A null value will remove an existing field value.</param>
-        <param name="extras">A Bundle containing additional information necessary for
-                       the operation. Arguments may include SQL style arguments, such
-                       as <c>ContentResolver#QUERY_ARG_SQL_LIMIT</c>, but note that
-                       the documentation for each individual provider will indicate
-                       which arguments they support.</param>
+        <param name="where">A filter to apply to rows before updating, formatted as an SQL WHERE clause
+                                (excluding the WHERE itself).</param>
         <summary>Update row(s) in a content URI.</summary>
         <returns>the number of rows updated.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentResolver#update(android.net.Uri,%20android.content.ContentValues,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.update(android.net.Uri, android.content.ContentValues, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#update(android.net.Uri,%20android.content.ContentValues,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4992,9 +4974,21 @@
       </Parameters>
       <Docs>
         <param name="wrapped">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Create a <c>ContentResolver</c> instance that redirects all its methods
+            to the given <c>ContentProvider</c>.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#wrap(android.content.ContentProvider)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.wrap(android.content.ContentProvider)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Wrap">
@@ -5021,9 +5015,21 @@
       </Parameters>
       <Docs>
         <param name="wrapped">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Create a <c>ContentResolver</c> instance that redirects all its methods
+            to the given <c>ContentProviderClient</c>.</summary>
         <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/ContentResolver#wrap(android.content.ContentProviderClient)" title="Reference documentation">Java documentation for <code>android.content.ContentResolver.wrap(android.content.ContentProviderClient)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/Mono.Android/en/Android.Content/ContentValues.xml b/docs/Mono.Android/en/Android.Content/ContentValues.xml
index 20938f73d2..912c9b4eb3 100644
--- a/docs/Mono.Android/en/Android.Content/ContentValues.xml
+++ b/docs/Mono.Android/en/Android.Content/ContentValues.xml
@@ -101,12 +101,12 @@
         <Parameter Name="from" Type="Android.Content.ContentValues" />
       </Parameters>
       <Docs>
-        <param name="from">To be added.</param>
-        <summary>Creates an empty set of values using the default initial size</summary>
+        <param name="from">the values to copy</param>
+        <summary>Creates a set of values copied from the given set</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentValues#ContentValues()" title="Reference documentation">Java documentation for <code>android.content.ContentValues.ContentValues()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentValues#ContentValues(android.content.ContentValues)" title="Reference documentation">Java documentation for <code>android.content.ContentValues.ContentValues(android.content.ContentValues)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,12 +138,12 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
-        <summary>Creates an empty set of values using the default initial size</summary>
+        <param name="size">the initial size of the set of values</param>
+        <summary>Creates an empty set of values using the given initial size</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentValues#ContentValues()" title="Reference documentation">Java documentation for <code>android.content.ContentValues.ContentValues()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentValues#ContentValues(int)" title="Reference documentation">Java documentation for <code>android.content.ContentValues.ContentValues(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -817,7 +817,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentValues#put(java.lang.String,%20java.lang.Boolean)" title="Reference documentation">Java documentation for <code>android.content.ContentValues.put(java.lang.String, java.lang.Boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentValues#put(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>android.content.ContentValues.put(java.lang.String, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1063,7 +1063,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/ContentValues#put(java.lang.String,%20java.lang.Boolean)" title="Reference documentation">Java documentation for <code>android.content.ContentValues.put(java.lang.String, java.lang.Boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/ContentValues#put(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.ContentValues.put(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/Context.xml b/docs/Mono.Android/en/Android.Content/Context.xml
index 0f09f81556..b8c49f20e2 100644
--- a/docs/Mono.Android/en/Android.Content/Context.xml
+++ b/docs/Mono.Android/en/Android.Content/Context.xml
@@ -654,26 +654,28 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="service">Identifies the service to connect to.  The Intent may
-      specify either an explicit component name, or a logical
-      description (action, category, etc) to match an
-      <see cref="T:Android.Content.IntentFilter" /> published by a service.</param>
+        <param name="service">Identifies the service to connect to.  The Intent must
+                 specify an explicit component name.</param>
         <param name="conn">Receives information as the service is started and stopped.
-      This must be a valid ServiceConnection object; it must not be null.</param>
+                 This must be a valid ServiceConnection object; it must not be null.</param>
         <param name="flags">Operation options for the binding.  May be 0,
-          <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Content Context BIND_AUTO_CREATE';scope=Xamarin" title="Android.Content.Context.BIND_AUTO_CREATE">Android.Content.Context.BIND_AUTO_CREATE</a></format>, <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Content Context BIND_DEBUG_UNBIND';scope=Xamarin" title="Android.Content.Context.BIND_DEBUG_UNBIND">Android.Content.Context.BIND_DEBUG_UNBIND</a></format>,
-          <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Content Context BIND_NOT_FOREGROUND';scope=Xamarin" title="Android.Content.Context.BIND_NOT_FOREGROUND">Android.Content.Context.BIND_NOT_FOREGROUND</a></format>, <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Content Context BIND_ABOVE_CLIENT';scope=Xamarin" title="Android.Content.Context.BIND_ABOVE_CLIENT">Android.Content.Context.BIND_ABOVE_CLIENT</a></format>,
-          <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Content Context BIND_ALLOW_OOM_MANAGEMENT';scope=Xamarin" title="Android.Content.Context.BIND_ALLOW_OOM_MANAGEMENT">Android.Content.Context.BIND_ALLOW_OOM_MANAGEMENT</a></format>, or
-          <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Content Context BIND_WAIVE_PRIORITY';scope=Xamarin" title="Android.Content.Context.BIND_WAIVE_PRIORITY">Android.Content.Context.BIND_WAIVE_PRIORITY</a></format>.</param>
-        <param name="executor">Callbacks on ServiceConnection will be called on executor. Must use same
-                 instance for the same instance of ServiceConnection.</param>
-        <summary>Same as <c>#bindService(Intent, ServiceConnection, int)</c> with executor to control
-            ServiceConnection callbacks.</summary>
-        <returns>To be added.</returns>
+                     <c>#BIND_AUTO_CREATE</c>, <c>#BIND_DEBUG_UNBIND</c>,
+                     <c>#BIND_NOT_FOREGROUND</c>, <c>#BIND_ABOVE_CLIENT</c>,
+                     <c>#BIND_ALLOW_OOM_MANAGEMENT</c>, <c>#BIND_WAIVE_PRIORITY</c>.
+                     <c>#BIND_IMPORTANT</c>, <c>#BIND_ADJUST_WITH_ACTIVITY</c>,
+                     <c>#BIND_NOT_PERCEPTIBLE</c>, or <c>#BIND_INCLUDE_CAPABILITIES</c>.</param>
+        <summary>Connect to an application service, creating it if needed.</summary>
+        <returns>
+          <c>true</c> if the system is in the process of bringing up a
+                    service that your client has permission to bind to; <c>false</c>
+                    if the system couldn't find the service or if your client doesn't
+                    have permission to bind to it. If this value is <c>true</c>, you
+                    should later call <c>#unbindService</c> to release the
+                    connection.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20int,%20java.util.concurrent.Executor,%20android.content.ServiceConnection)" title="Reference documentation">Java documentation for <code>android.content.Context.bindService(android.content.Intent, int, java.util.concurrent.Executor, android.content.ServiceConnection)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.bindService(android.content.Intent, android.content.ServiceConnection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -769,13 +771,37 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="service">To be added.</param>
-        <param name="conn">To be added.</param>
-        <param name="flags">To be added.</param>
         <param name="user">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="service">Identifies the service to connect to.  The Intent must
+                 specify an explicit component name.</param>
+        <param name="conn">Receives information as the service is started and stopped.
+                 This must be a valid ServiceConnection object; it must not be null.</param>
+        <param name="flags">Operation options for the binding.  May be 0,
+                     <c>#BIND_AUTO_CREATE</c>, <c>#BIND_DEBUG_UNBIND</c>,
+                     <c>#BIND_NOT_FOREGROUND</c>, <c>#BIND_ABOVE_CLIENT</c>,
+                     <c>#BIND_ALLOW_OOM_MANAGEMENT</c>, <c>#BIND_WAIVE_PRIORITY</c>.
+                     <c>#BIND_IMPORTANT</c>, or
+                     <c>#BIND_ADJUST_WITH_ACTIVITY</c>.</param>
+        <summary>Binds to a service in the given <c>user</c> in the same manner as
+            <c>#bindService(Intent, ServiceConnection, int)</c>.</summary>
+        <returns>
+          <c>true</c> if the system is in the process of bringing up a
+                    service that your client has permission to bind to; <c>false</c>
+                    if the system couldn't find the service. If this value is <c>true</c>, you
+                    should later call <c>#unbindService</c> to release the
+                    connection.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/Context#bindServiceAsUser(android.content.Intent,%20android.content.ServiceConnection,%20int,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.content.Context.bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="BiometricService">
@@ -1567,25 +1593,25 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="uri">The Uri whose permission is to be checked, or null to not
+            do this check.</param>
         <param name="readPermission">The permission that provides overall read access,
- or null to not do this check.</param>
+            or null to not do this check.</param>
         <param name="writePermission">The permission that provides overall write
- access, or null to not do this check.</param>
-        <param name="uri">The uri that is being checked.</param>
+            access, or null to not do this check.</param>
         <param name="pid">The process ID being checked against.  Must be &amp;gt; 0.</param>
         <param name="uid">The user ID being checked against.  A uid of 0 is the root
             user, which will pass every permission check.</param>
         <param name="modeFlags">The access modes to check.</param>
-        <summary>Determine whether a particular process and user ID has been granted
-            permission to access a specific URI.</summary>
+        <summary>Check both a Uri and normal permission.</summary>
         <returns>
-          <c>PackageManager#PERMISSION_GRANTED</c> if the given
-            pid/uid is allowed to access that uri, or
+          <c>PackageManager#PERMISSION_GRANTED</c> if the caller
+            is allowed to access that uri or holds one of the given permissions, or
             <c>PackageManager#PERMISSION_DENIED</c> if it is not.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#checkUriPermission(android.net.Uri,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.checkUriPermission(android.net.Uri, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#checkUriPermission(android.net.Uri,%20java.lang.String,%20java.lang.String,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2338,16 +2364,17 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="display">To be added.</param>
+        <param name="display">The <c>Display</c> to associate with</param>
         <param name="type">Window type in <c>WindowManager.LayoutParams</c></param>
-        <param name="options">A bundle used to pass window-related options</param>
-        <summary>Creates a Context for a non-activity window.</summary>
+        <param name="options">A bundle used to pass window-related options.</param>
+        <summary>Creates a <c>Context</c> for a non-<c>android.app.Activity activity</c> window on the given
+            <c>Display</c>.</summary>
         <returns>A <c>Context</c> that can be used to create
                     non-<c>android.app.Activity activity</c> windows.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#createWindowContext(int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Context.createWindowContext(int, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#createWindowContext(android.view.Display,%20int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Context.createWindowContext(android.view.Display, int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -3197,22 +3224,22 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
+        <param name="uri">The Uri whose permission is to be checked, or null to not
+            do this check.</param>
         <param name="readPermission">The permission that provides overall read access,
- or null to not do this check.</param>
+            or null to not do this check.</param>
         <param name="writePermission">The permission that provides overall write
- access, or null to not do this check.</param>
-        <param name="uri">The uri that is being checked.</param>
+            access, or null to not do this check.</param>
         <param name="pid">The process ID being checked against.  Must be &amp;gt; 0.</param>
         <param name="uid">The user ID being checked against.  A uid of 0 is the root
             user, which will pass every permission check.</param>
         <param name="modeFlags">The access modes to enforce.</param>
         <param name="message">A message to include in the exception if it is thrown.</param>
-        <summary>If a particular process and user ID has not been granted
-            permission to access a specific URI, throw <c>SecurityException</c>.</summary>
+        <summary>Enforce both a Uri and normal permission.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#enforceUriPermission(android.net.Uri,%20int,%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Context.enforceUriPermission(android.net.Uri, int, int, int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#enforceUriPermission(android.net.Uri,%20java.lang.String,%20java.lang.String,%20int,%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Context.enforceUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -4013,18 +4040,24 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="name">Desired preferences file. If a preferences file by this name
- does not exist, it will be created when you retrieve an
- editor (SharedPreferences.edit()) and then commit changes (Editor.commit()).</param>
-        <param name="mode">Operating mode.  Use 0 or <see cref="F:Android.Content.FileCreationMode.Private" tool="ReplaceLinkValue" /> for the
- default operation, <see cref="F:Android.Content.FileCreationMode.WorldReadable" tool="ReplaceLinkValue" />
- and <see cref="F:Android.Content.FileCreationMode.WorldWriteable" tool="ReplaceLinkValue" /> to control permissions.</param>
+        <param name="name">Desired preferences file.</param>
+        <param name="mode">Operating mode.</param>
         <summary>Retrieve and hold the contents of the preferences file 'name', returning
- a SharedPreferences through which you can retrieve and modify its
- values.</summary>
-        <returns>To be added.</returns>
+            a SharedPreferences through which you can retrieve and modify its
+            values.</summary>
+        <returns>The single <c>SharedPreferences</c> instance that can be used
+                    to retrieve and modify the preference values.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/Context#getSharedPreferences(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.getSharedPreferences(java.lang.String, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -4103,8 +4136,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="formatArgs">To be added.</param>
         <param name="resId">Resource id for the string</param>
+        <param name="formatArgs">To be added.</param>
         <summary>Returns a localized string from the application's package's
             default string table.</summary>
         <returns>The string data associated with the resource, stripped of styled
@@ -4199,14 +4232,12 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the desired service.</param>
-        <param name="serviceClass">The class of the desired service.</param>
-        <summary>Return the handle to a system-level service by class.</summary>
-        <returns>The service or <c>null</c> if the class is not a supported system service. Note:
-            &lt;b&gt;never&lt;/b&gt; throw a <c>RuntimeException</c> if the name is not supported.</returns>
+        <summary>Return the handle to a system-level service by name.</summary>
+        <returns>The service or <c>null</c> if the name does not exist.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#getSystemService(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.content.Context.getSystemService(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#getSystemService(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Context.getSystemService(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -5532,7 +5563,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#obtainStyledAttributes(int,%20int[])" title="Reference documentation">Java documentation for <code>android.content.Context.obtainStyledAttributes(int, int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#obtainStyledAttributes(int[])" title="Reference documentation">Java documentation for <code>android.content.Context.obtainStyledAttributes(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5575,7 +5606,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#obtainStyledAttributes(int,%20int[])" title="Reference documentation">Java documentation for <code>android.content.Context.obtainStyledAttributes(int, int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#obtainStyledAttributes(android.util.AttributeSet,%20int[])" title="Reference documentation">Java documentation for <code>android.content.Context.obtainStyledAttributes(android.util.AttributeSet, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5666,7 +5697,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#obtainStyledAttributes(int,%20int[])" title="Reference documentation">Java documentation for <code>android.content.Context.obtainStyledAttributes(int, int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#obtainStyledAttributes(android.util.AttributeSet,%20int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.obtainStyledAttributes(android.util.AttributeSet, int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5872,12 +5903,12 @@
         <Parameter Name="errorHandler" Type="Android.Database.IDatabaseErrorHandler" />
       </Parameters>
       <Docs>
-        <param name="errorHandler">the <see cref="T:Android.Database.IDatabaseErrorHandler" /> to be used when sqlite reports database
- corruption. if null, <see cref="T:Android.Database.DefaultDatabaseErrorHandler" /> is assumed.</param>
         <param name="name">The name (unique in the application package) of the database.</param>
         <param name="mode">Operating mode.</param>
         <param name="factory">An optional factory class that is called to instantiate a
                        cursor when query is called.</param>
+        <param name="errorHandler">the <see cref="T:Android.Database.IDatabaseErrorHandler" /> to be used when sqlite reports database
+ corruption. if null, <see cref="T:Android.Database.DefaultDatabaseErrorHandler" /> is assumed.</param>
         <summary>Open a new private SQLiteDatabase associated with this Context's
             application package.</summary>
         <returns>The contents of a newly created database with the given name.</returns>
@@ -6430,16 +6461,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
         <param name="receiver">The BroadcastReceiver to handle the broadcast.</param>
         <param name="filter">Selects the Intent broadcasts to be received.</param>
-        <summary>Register a BroadcastReceiver to be run in the main activity thread.</summary>
+        <param name="flags">Additional options for the receiver. May be 0 or
+                 <c>#RECEIVER_VISIBLE_TO_INSTANT_APPS</c>.</param>
+        <summary>Register to receive intent broadcasts, with the receiver optionally being
+            exposed to Instant Apps.</summary>
         <returns>The first sticky intent found that matches &lt;var&gt;filter&lt;/var&gt;,
                     or null if there are none.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#registerReceiver(android.content.BroadcastReceiver,%20android.content.IntentFilter)" title="Reference documentation">Java documentation for <code>android.content.Context.registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#registerReceiver(android.content.BroadcastReceiver,%20android.content.IntentFilter,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6476,20 +6509,21 @@
         <Parameter Name="scheduler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="broadcastPermission">String naming a permissions that a
-      broadcaster must hold in order to send an Intent to you.  If null,
-      no permission is required.</param>
-        <param name="scheduler">Handler identifying the thread that will receive
-      the Intent.  If null, the main thread of the process will be used.</param>
         <param name="receiver">The BroadcastReceiver to handle the broadcast.</param>
         <param name="filter">Selects the Intent broadcasts to be received.</param>
-        <summary>Register a BroadcastReceiver to be run in the main activity thread.</summary>
+        <param name="broadcastPermission">String naming a permissions that a
+                 broadcaster must hold in order to send an Intent to you.  If null,
+                 no permission is required.</param>
+        <param name="scheduler">Handler identifying the thread that will receive
+                 the Intent.  If null, the main thread of the process will be used.</param>
+        <summary>Register to receive intent broadcasts, to run in the context of
+            &lt;var&gt;scheduler&lt;/var&gt;.</summary>
         <returns>The first sticky intent found that matches &lt;var&gt;filter&lt;/var&gt;,
                     or null if there are none.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#registerReceiver(android.content.BroadcastReceiver,%20android.content.IntentFilter)" title="Reference documentation">Java documentation for <code>android.content.Context.registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#registerReceiver(android.content.BroadcastReceiver,%20android.content.IntentFilter,%20java.lang.String,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.content.Context.registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -6538,18 +6572,23 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="broadcastPermission">To be added.</param>
-        <param name="scheduler">To be added.</param>
-        <param name="flags">To be added.</param>
         <param name="receiver">The BroadcastReceiver to handle the broadcast.</param>
         <param name="filter">Selects the Intent broadcasts to be received.</param>
-        <summary>Register a BroadcastReceiver to be run in the main activity thread.</summary>
+        <param name="broadcastPermission">String naming a permissions that a
+                 broadcaster must hold in order to send an Intent to you.  If null,
+                 no permission is required.</param>
+        <param name="scheduler">Handler identifying the thread that will receive
+                 the Intent.  If null, the main thread of the process will be used.</param>
+        <param name="flags">Additional options for the receiver. May be 0 or
+                 <c>#RECEIVER_VISIBLE_TO_INSTANT_APPS</c>.</param>
+        <summary>Register to receive intent broadcasts, to run in the context of
+            &lt;var&gt;scheduler&lt;/var&gt;.</summary>
         <returns>The first sticky intent found that matches &lt;var&gt;filter&lt;/var&gt;,
                     or null if there are none.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#registerReceiver(android.content.BroadcastReceiver,%20android.content.IntentFilter)" title="Reference documentation">Java documentation for <code>android.content.Context.registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#registerReceiver(android.content.BroadcastReceiver,%20android.content.IntentFilter,%20java.lang.String,%20android.os.Handler,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6799,15 +6838,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="toPackage">To be added.</param>
+        <param name="toPackage">The package you had previously granted access to.</param>
         <param name="uri">The Uri you would like to revoke access to.</param>
         <param name="modeFlags">The access modes to revoke.</param>
-        <summary>Remove all permissions to access a particular content provider Uri
-            that were previously added with <c>#grantUriPermission</c> or &lt;em&gt;any other&lt;/em&gt; mechanism.</summary>
+        <summary>Remove permissions to access a particular content provider Uri
+            that were previously added with <c>#grantUriPermission</c> for a specific target
+            package.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#revokeUriPermission(android.net.Uri,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.revokeUriPermission(android.net.Uri, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#revokeUriPermission(java.lang.String,%20android.net.Uri,%20int)" title="Reference documentation">Java documentation for <code>android.content.Context.revokeUriPermission(java.lang.String, android.net.Uri, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6961,16 +7001,17 @@
         <Parameter Name="receiverPermission" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="receiverPermission">(optional) String naming a permission that
-               a receiver must hold in order to receive your broadcast.
-               If null, no permission is required.</param>
         <param name="intent">The Intent to broadcast; all receivers matching this
                           Intent will receive the broadcast.</param>
-        <summary>Broadcast the given intent to all interested BroadcastReceivers.</summary>
+        <param name="receiverPermission">(optional) String naming a permission that
+                          a receiver must hold in order to receive your broadcast.
+                          If null, no permission is required.</param>
+        <summary>Broadcast the given intent to all interested BroadcastReceivers, allowing
+            an optional required permission to be enforced.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#sendBroadcast(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.Context.sendBroadcast(android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#sendBroadcast(android.content.Intent,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Context.sendBroadcast(android.content.Intent, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -7064,17 +7105,18 @@
         <Parameter Name="receiverPermission" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="receiverPermission">(optional) String naming a permission that
-               a receiver must hold in order to receive your broadcast.
-               If null, no permission is required.</param>
-        <param name="intent">The intent to broadcast</param>
+        <param name="intent">The Intent to broadcast; all receivers matching this
+                          Intent will receive the broadcast.</param>
         <param name="user">UserHandle to send the intent to.</param>
-        <summary>Version of <c>#sendBroadcast(Intent)</c> that allows you to specify the
+        <param name="receiverPermission">(optional) String naming a permission that
+                          a receiver must hold in order to receive your broadcast.
+                          If null, no permission is required.</param>
+        <summary>Version of <c>#sendBroadcast(Intent, String)</c> that allows you to specify the
             user the broadcast will be sent to.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#sendBroadcastAsUser(android.content.Intent,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.content.Context.sendBroadcastAsUser(android.content.Intent, android.os.UserHandle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#sendBroadcastAsUser(android.content.Intent,%20android.os.UserHandle,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Context.sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -7157,13 +7199,24 @@
       </Parameters>
       <Docs>
         <param name="intent">The Intent to broadcast; all receivers matching this
-               Intent will receive the broadcast.</param>
+                          Intent will receive the broadcast.</param>
         <param name="receiverPermission">(optional) String naming a permissions that
-               a receiver must hold in order to receive your broadcast.
-               If null, no permission is required.</param>
-        <summary ToolPath="TrimmedButTooLong" tool="FirstSentenceInLongSummaries">To be added.</summary>
+                          a receiver must hold in order to receive your broadcast.
+                          If null, no permission is required.</param>
+        <summary>Broadcast the given intent to all interested BroadcastReceivers, delivering
+            them one at a time to allow more preferred receivers to consume the
+            broadcast before it is delivered to less preferred receivers.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/Context#sendOrderedBroadcast(android.content.Intent,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Context.sendOrderedBroadcast(android.content.Intent, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <altmember cref="T:Android.Content.BroadcastReceiver" />
@@ -7209,25 +7262,34 @@
       </Parameters>
       <Docs>
         <param name="intent">The Intent to broadcast; all receivers matching this
-               Intent will receive the broadcast.</param>
+                          Intent will receive the broadcast.</param>
         <param name="receiverPermission">String naming a permissions that
-               a receiver must hold in order to receive your broadcast.
-               If null, no permission is required.</param>
+                          a receiver must hold in order to receive your broadcast.
+                          If null, no permission is required.</param>
         <param name="resultReceiver">Your own BroadcastReceiver to treat as the final
-                       receiver of the broadcast.</param>
+                                  receiver of the broadcast.</param>
         <param name="scheduler">A custom Handler with which to schedule the
-                  resultReceiver callback; if null it will be
-                  scheduled in the Context's main thread.</param>
+                             resultReceiver callback; if null it will be
+                             scheduled in the Context's main thread.</param>
         <param name="initialCode">An initial value for the result code.  Often
-                    Activity.RESULT_OK.</param>
+                               Activity.RESULT_OK.</param>
         <param name="initialData">An initial value for the result data.  Often
-                    null.</param>
+                               null.</param>
         <param name="initialExtras">An initial value for the result extras.  Often
-                      null.</param>
-        <summary>Version of <see cref="M:Android.Content.Context.SendBroadcast(Android.Content.Intent)" /> that allows you to
- receive data back from the broadcast.</summary>
+                                 null.</param>
+        <summary>Version of <c>#sendBroadcast(Intent)</c> that allows you to
+            receive data back from the broadcast.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/Context#sendOrderedBroadcast(android.content.Intent,%20java.lang.String,%20android.content.BroadcastReceiver,%20android.os.Handler,%20int,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Context.sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <altmember cref="M:Android.Content.Context.SendBroadcast(Android.Content.Intent)" />
@@ -7274,16 +7336,42 @@
         <Parameter Name="initialExtras" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="intent">To be added.</param>
-        <param name="receiverPermission">To be added.</param>
-        <param name="receiverAppOp">To be added.</param>
-        <param name="resultReceiver">To be added.</param>
-        <param name="scheduler">To be added.</param>
-        <param name="initialCode">To be added.</param>
-        <param name="initialData">To be added.</param>
-        <param name="initialExtras">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="intent">The Intent to broadcast; all receivers matching this
+                          Intent will receive the broadcast.</param>
+        <param name="receiverPermission">String naming a permissions that
+                          a receiver must hold in order to receive your broadcast.
+                          If null, no permission is required.</param>
+        <param name="receiverAppOp">The app op associated with the broadcast. If null, no appOp is
+                                 required. If both receiverAppOp and receiverPermission are non-null,
+                                 a receiver must have both of them to
+                                 receive the broadcast</param>
+        <param name="resultReceiver">Your own BroadcastReceiver to treat as the final
+                                  receiver of the broadcast.</param>
+        <param name="scheduler">A custom Handler with which to schedule the
+                             resultReceiver callback; if null it will be
+                             scheduled in the Context's main thread.</param>
+        <param name="initialCode">An initial value for the result code.  Often
+                               Activity.RESULT_OK.</param>
+        <param name="initialData">An initial value for the result data.  Often
+                               null.</param>
+        <param name="initialExtras">An initial value for the result extras.  Often
+                                 null.</param>
+        <summary>Version of
+            <c>#sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String,
+            Bundle)</c> that allows you to specify the App Op to enforce restrictions on which receivers
+            the broadcast will be sent to.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/Context#sendOrderedBroadcast(android.content.Intent,%20java.lang.String,%20java.lang.String,%20android.content.BroadcastReceiver,%20android.os.Handler,%20int,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Context.sendOrderedBroadcast(android.content.Intent, java.lang.String, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="SendOrderedBroadcastAsUser">
@@ -7328,25 +7416,37 @@
       </Parameters>
       <Docs>
         <param name="intent">The Intent to broadcast; all receivers matching this
-               Intent will receive the broadcast.</param>
+                          Intent will receive the broadcast.</param>
         <param name="user">UserHandle to send the intent to.</param>
         <param name="receiverPermission">String naming a permissions that
-               a receiver must hold in order to receive your broadcast.
-               If null, no permission is required.</param>
+                          a receiver must hold in order to receive your broadcast.
+                          If null, no permission is required.</param>
         <param name="resultReceiver">Your own BroadcastReceiver to treat as the final
-                       receiver of the broadcast.</param>
+                                  receiver of the broadcast.</param>
         <param name="scheduler">A custom Handler with which to schedule the
-                  resultReceiver callback; if null it will be
-                  scheduled in the Context's main thread.</param>
+                             resultReceiver callback; if null it will be
+                             scheduled in the Context's main thread.</param>
         <param name="initialCode">An initial value for the result code.  Often
-                    Activity.RESULT_OK.</param>
+                               Activity.RESULT_OK.</param>
         <param name="initialData">An initial value for the result data.  Often
-                    null.</param>
+                               null.</param>
         <param name="initialExtras">An initial value for the result extras.  Often
-                      null.</param>
-        <summary ToolPath="TrimmedButTooLong" tool="FirstSentenceInLongSummaries">To be added.</summary>
+                                 null.</param>
+        <summary>Version of
+            <c>#sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)</c>
+            that allows you to specify the
+            user the broadcast will be sent to.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/Context#sendOrderedBroadcastAsUser(android.content.Intent,%20android.os.UserHandle,%20java.lang.String,%20android.content.BroadcastReceiver,%20android.os.Handler,%20int,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Context.sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 17" />
         <altmember cref="M:Android.Content.Context.SendOrderedBroadcast(Android.Content.Intent, System.String, System.String, System.String, System.String, System.String, System.String)" />
@@ -7435,10 +7535,11 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">To be added.</param>
         <param name="intent">The Intent to broadcast; all receivers matching this
             Intent will receive the broadcast, and the Intent will be held to
             be re-broadcast to future receivers.</param>
+        <param name="options">(optional) Additional sending options, generated from a
+            <c>android.app.BroadcastOptions</c>.</param>
         <summary>Perform a <c>#sendBroadcast(Intent)</c> that is "sticky," meaning the
             Intent you are sending stays around after the broadcast is complete,
             so that others can quickly retrieve that data through the return
@@ -7446,7 +7547,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#sendStickyBroadcast(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.Context.sendStickyBroadcast(android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#sendStickyBroadcast(android.content.Intent,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Context.sendStickyBroadcast(android.content.Intent, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -7796,7 +7897,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#setWallpaper(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.content.Context.setWallpaper(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#setWallpaper(java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.content.Context.setWallpaper(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -7913,9 +8014,9 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
+        <param name="intents">An array of Intents to be started.</param>
         <param name="options">Additional options for how the Activity should be started.
  See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.</param>
-        <param name="intents">An array of Intents to be started.</param>
         <summary>Same as <c>#startActivities(Intent[], Bundle)</c> with no options
             specified.</summary>
         <remarks>
@@ -8029,17 +8130,16 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- May be null if there are no options.  See <see cref="T:Android.App.ActivityOptions" />
- for how to build the Bundle supplied here; there are no supported definitions
- for building it manually.</param>
         <param name="intent">The description of the activity to start.</param>
-        <summary>Same as <c>#startActivity(Intent, Bundle)</c> with no options
-            specified.</summary>
+        <param name="options">Additional options for how the Activity should be started.
+            May be null if there are no options.  See <c>android.app.ActivityOptions</c>
+            for how to build the Bundle supplied here; there are no supported definitions
+            for building it manually.</param>
+        <summary>Launch a new activity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Context#startActivity(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.Context.startActivity(android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Context#startActivity(android.content.Intent,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Context.startActivity(android.content.Intent, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -8261,10 +8361,6 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">Additional options for how the Activity should be started.
- See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.  If options
- have also been supplied by the IntentSender, options given here will
- override any that conflict with those given by the IntentSender.</param>
         <param name="intent">The IntentSender to launch.</param>
         <param name="fillInIntent">If non-null, this will be provided as the
             intent parameter to <c>IntentSender#sendIntent</c>.</param>
@@ -8273,6 +8369,10 @@
         <param name="flagsValues">Desired values for any bits set in
             &lt;var&gt;flagsMask&lt;/var&gt;</param>
         <param name="extraFlags">Always set to 0.</param>
+        <param name="options">Additional options for how the Activity should be started.
+ See <see cref="M:Android.Content.Context.StartActivity(Android.Content.Intent,Android.OS.Bundle)" /> for more details.  If options
+ have also been supplied by the IntentSender, options given here will
+ override any that conflict with those given by the IntentSender.</param>
         <summary>Same as <c>#startIntentSender(IntentSender, Intent, int, int, int, Bundle)</c>
             with no options specified.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Content/ContextWrapper.xml b/docs/Mono.Android/en/Android.Content/ContextWrapper.xml
index ae299b372a..83b56727ab 100644
--- a/docs/Mono.Android/en/Android.Content/ContextWrapper.xml
+++ b/docs/Mono.Android/en/Android.Content/ContextWrapper.xml
@@ -3205,8 +3205,6 @@
         <param name="intent">The Intent to broadcast; all receivers matching this
             Intent will receive the broadcast, and the Intent will be held to
             be re-broadcast to future receivers.</param>
-        <param name="options">(optional) Additional sending options, generated from a
-            <c>android.app.BroadcastOptions</c>.</param>
         <summary>Perform a <c>#sendBroadcast(Intent)</c> that is "sticky," meaning the
             Intent you are sending stays around after the broadcast is complete,
             so that others can quickly retrieve that data through the return
diff --git a/docs/Mono.Android/en/Android.Content/CursorLoader.xml b/docs/Mono.Android/en/Android.Content/CursorLoader.xml
index f7894d3f79..9fc1f38ad2 100644
--- a/docs/Mono.Android/en/Android.Content/CursorLoader.xml
+++ b/docs/Mono.Android/en/Android.Content/CursorLoader.xml
@@ -137,11 +137,11 @@
         <param name="selection">To be added.</param>
         <param name="selectionArgs">To be added.</param>
         <param name="sortOrder">To be added.</param>
-        <summary>Creates an empty unspecified CursorLoader.</summary>
+        <summary>Creates a fully-specified CursorLoader.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/CursorLoader#CursorLoader(android.content.Context)" title="Reference documentation">Java documentation for <code>android.content.CursorLoader.CursorLoader(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/CursorLoader#CursorLoader(android.content.Context,%20android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.CursorLoader.CursorLoader(android.content.Context, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/Intent.xml b/docs/Mono.Android/en/Android.Content/Intent.xml
index 4ac7f44ea7..a1eef71e68 100644
--- a/docs/Mono.Android/en/Android.Content/Intent.xml
+++ b/docs/Mono.Android/en/Android.Content/Intent.xml
@@ -100,11 +100,11 @@
       </Parameters>
       <Docs>
         <param name="o">To be added.</param>
-        <summary>Create an empty intent.</summary>
+        <summary>Copy constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#Intent()" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#Intent(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent(android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
@@ -136,12 +136,12 @@
         <Parameter Name="action" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <summary>Create an empty intent.</summary>
+        <param name="action">The Intent action, such as ACTION_VIEW.</param>
+        <summary>Create an intent with a given action.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#Intent()" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#Intent(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -174,13 +174,14 @@
         <Parameter Name="cls" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="packageContext">To be added.</param>
-        <param name="cls">To be added.</param>
-        <summary>Create an empty intent.</summary>
+        <param name="packageContext">A Context of the application package implementing
+            this class.</param>
+        <param name="cls">The component class that is to be used for the intent.</param>
+        <summary>Create an intent for a specific component.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#Intent()" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#Intent(android.content.Context,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent(android.content.Context, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -258,13 +259,13 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <param name="uri">To be added.</param>
-        <summary>Create an empty intent.</summary>
+        <param name="action">The Intent action, such as ACTION_VIEW.</param>
+        <param name="uri">The Intent data URI.</param>
+        <summary>Create an intent with a given action and for a given data url.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#Intent()" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#Intent(java.lang.String,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent(java.lang.String, android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -299,15 +300,16 @@
         <Parameter Name="cls" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <param name="uri">To be added.</param>
-        <param name="packageContext">To be added.</param>
-        <param name="cls">To be added.</param>
-        <summary>Create an empty intent.</summary>
+        <param name="action">The Intent action, such as ACTION_VIEW.</param>
+        <param name="uri">The Intent data URI.</param>
+        <param name="packageContext">A Context of the application package implementing
+            this class.</param>
+        <param name="cls">The component class that is to be used for the intent.</param>
+        <summary>Create an intent for a specific component with a specified action and data.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#Intent()" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#Intent(java.lang.String,%20android.net.Uri,%20android.content.Context,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.content.Intent.Intent(java.lang.String, android.net.Uri, android.content.Context, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -7760,11 +7762,11 @@
         <Parameter Name="sender" Type="Android.Content.IntentSender" />
       </Parameters>
       <Docs>
-        <param name="sender">To be added.</param>
         <param name="target">The Intent that the user will be selecting an activity
             to perform.</param>
         <param name="title">Optional title that will be displayed in the chooser,
             only when the target action is not ACTION_SEND or ACTION_SEND_MULTIPLE.</param>
+        <param name="sender">Optional IntentSender to be called when a choice is made.</param>
         <summary>Convenience function for creating a <c>#ACTION_CHOOSER</c> Intent.</summary>
         <returns>Return a new Intent object that you can hand to
             <c>Context#startActivity(Intent) Context.startActivity()</c> and
@@ -7772,7 +7774,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#createChooser(android.content.Intent,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.content.Intent.createChooser(android.content.Intent, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#createChooser(android.content.Intent,%20java.lang.CharSequence,%20android.content.IntentSender)" title="Reference documentation">Java documentation for <code>android.content.Intent.createChooser(android.content.Intent, java.lang.CharSequence, android.content.IntentSender)</code>.</a>
             </format>
           </para>
           <para>
@@ -7802,11 +7804,11 @@
         <Parameter Name="sender" Type="Android.Content.IntentSender" />
       </Parameters>
       <Docs>
-        <param name="sender">To be added.</param>
         <param name="target">The Intent that the user will be selecting an activity
             to perform.</param>
         <param name="title">Optional title that will be displayed in the chooser,
             only when the target action is not ACTION_SEND or ACTION_SEND_MULTIPLE.</param>
+        <param name="sender">Optional IntentSender to be called when a choice is made.</param>
         <summary>Convenience function for creating a <c>#ACTION_CHOOSER</c> Intent.</summary>
         <returns>Return a new Intent object that you can hand to
             <c>Context#startActivity(Intent) Context.startActivity()</c> and
@@ -7814,7 +7816,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#createChooser(android.content.Intent,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.content.Intent.createChooser(android.content.Intent, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#createChooser(android.content.Intent,%20java.lang.CharSequence,%20android.content.IntentSender)" title="Reference documentation">Java documentation for <code>android.content.Intent.createChooser(android.content.Intent, java.lang.CharSequence, android.content.IntentSender)</code>.</a>
             </format>
           </para>
           <para>
@@ -13463,14 +13465,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The Bundle data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -13510,14 +13512,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The Parcelable data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20android.os.Parcelable)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, android.os.Parcelable)</code>.</a>
             </format>
           </para>
           <para>
@@ -13557,14 +13559,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The Parcelable[] data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20android.os.Parcelable[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, android.os.Parcelable[])</code>.</a>
             </format>
           </para>
           <para>
@@ -13604,14 +13606,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The Serializable data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20java.io.Serializable)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, java.io.Serializable)</code>.</a>
             </format>
           </para>
           <para>
@@ -13651,14 +13653,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The CharSequence data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -13698,14 +13700,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The CharSequence array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
@@ -13745,14 +13747,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The boolean data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -13792,14 +13794,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The boolean array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20boolean[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, boolean[])</code>.</a>
             </format>
           </para>
           <para>
@@ -13839,14 +13841,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The byte array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -13886,14 +13888,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The char data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20char)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, char)</code>.</a>
             </format>
           </para>
           <para>
@@ -13933,14 +13935,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The char array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20char[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -13980,14 +13982,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The double data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -14027,14 +14029,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The double array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20double[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -14074,14 +14076,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The short data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20short)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, short)</code>.</a>
             </format>
           </para>
           <para>
@@ -14121,14 +14123,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The short array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20short[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -14168,14 +14170,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The integer data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -14215,14 +14217,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The int array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -14262,14 +14264,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The long data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -14309,14 +14311,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The byte array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20long[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -14403,14 +14405,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The float data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -14450,14 +14452,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The float array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20float[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -14497,14 +14499,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The String data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -14544,14 +14546,14 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the extra data, with package prefix.</param>
-        <param name="value">The byte data value.</param>
+        <param name="value">The String array data value.</param>
         <summary>Add extended data to the intent.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtra(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtra(java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -14632,13 +14634,12 @@
       </Parameters>
       <Docs>
         <param name="extras">The Bundle of extras to add to this intent.</param>
-        <param name="src">Contains the extras to copy.</param>
-        <summary>Copy all extras in 'src' in to this intent.</summary>
+        <summary>Add a set of extended data to the intent.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#putExtras(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtras(android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#putExtras(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Intent.putExtras(android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -15008,17 +15009,14 @@
       </Parameters>
       <Docs>
         <param name="extras">The new set of extras in the Intent, or null to erase
- all extras.
-</param>
-        <param name="src">The exact extras contained in this Intent are copied
-            into the target intent, replacing any that were previously there.</param>
-        <summary>Completely replace the extras in the Intent with the extras in the
-            given Intent.</summary>
+            all extras.</param>
+        <summary>Completely replace the extras in the Intent with the given Bundle of
+            extras.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#replaceExtras(android.content.Intent)" title="Reference documentation">Java documentation for <code>android.content.Intent.replaceExtras(android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#replaceExtras(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.content.Intent.replaceExtras(android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -15197,14 +15195,12 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
-        <param name="resolver">A ContentResolver that can be used to determine the MIME
-                            type of the intent's data.</param>
         <summary>Return the MIME data type of this intent.</summary>
         <returns>The MIME type of this intent.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#resolveType(android.content.ContentResolver)" title="Reference documentation">Java documentation for <code>android.content.Intent.resolveType(android.content.ContentResolver)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#resolveType(android.content.Context)" title="Reference documentation">Java documentation for <code>android.content.Intent.resolveType(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -15541,19 +15537,17 @@
       </Parameters>
       <Docs>
         <param name="packageName">The name of the package implementing the desired
- component.</param>
-        <param name="packageContext">A Context of the application package implementing
-            this class.</param>
+            component.</param>
         <param name="className">The name of a class inside of the application package
             that will be used as the component for this Intent.</param>
         <summary>Convenience for calling <c>#setComponent</c> with an
-            explicit class name.</summary>
+            explicit application package name and class name.</summary>
         <returns>Returns the same Intent object, for chaining multiple calls
             into a single statement.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/Intent#setClassName(android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Intent.setClassName(android.content.Context, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/Intent#setClassName(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.Intent.setClassName(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/IntentFilter.xml b/docs/Mono.Android/en/Android.Content/IntentFilter.xml
index 15c06bccda..6b3fa4aeba 100644
--- a/docs/Mono.Android/en/Android.Content/IntentFilter.xml
+++ b/docs/Mono.Android/en/Android.Content/IntentFilter.xml
@@ -100,12 +100,12 @@
         <Parameter Name="o" Type="Android.Content.IntentFilter" />
       </Parameters>
       <Docs>
-        <param name="o">To be added.</param>
-        <summary>New empty IntentFilter.</summary>
+        <param name="o">The original filter to copy.</param>
+        <summary>New IntentFilter containing a copy of an existing filter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/IntentFilter#IntentFilter()" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.IntentFilter()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#IntentFilter(android.content.IntentFilter)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.IntentFilter(android.content.IntentFilter)</code>.</a>
             </format>
           </para>
           <para>
@@ -137,12 +137,12 @@
         <Parameter Name="action" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <summary>New empty IntentFilter.</summary>
+        <param name="action">The action to match, such as Intent.ACTION_MAIN.</param>
+        <summary>New IntentFilter that matches a single action with no data.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/IntentFilter#IntentFilter()" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.IntentFilter()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#IntentFilter(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.IntentFilter(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -198,13 +198,13 @@
         <Parameter Name="dataType" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <param name="dataType">To be added.</param>
-        <summary>New empty IntentFilter.</summary>
+        <param name="action">The action to match, such as Intent.ACTION_VIEW.</param>
+        <param name="dataType">The type to match, such as "vnd.android.cursor.dir/person".</param>
+        <summary>New IntentFilter that matches a single action and data type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/IntentFilter#IntentFilter()" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.IntentFilter()</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#IntentFilter(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.IntentFilter(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -360,12 +360,21 @@
       </Parameters>
       <Docs>
         <param name="host">The host part of the authority to match.  May start with a
-             single '*' to wildcard the front of the host name.</param>
+                        single '*' to wildcard the front of the host name.</param>
         <param name="port">Optional port part of the authority to match.  If null, any
-             port is allowed.</param>
+                        port is allowed.</param>
         <summary>Add a new Intent data authority to match against.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#addDataAuthority(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.addDataAuthority(java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <altmember cref="M:Android.Content.IntentFilter.MatchData(System.String, System.String, System.String)" />
@@ -404,14 +413,24 @@
       </Parameters>
       <Docs>
         <param name="path">Either a raw string that must exactly match the file
- path, or a simple pattern, depending on <format type="text/html"><var>type</var></format>.</param>
-        <param name="type">Determines how <format type="text/html"><var>path</var></format> will be compared to
- determine a match: either <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android OS PatternMatcher PATTERN_LITERAL';scope=Xamarin" title="Android.OS.PatternMatcher.PATTERN_LITERAL">Android.OS.PatternMatcher.PATTERN_LITERAL</a></format>,
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android OS PatternMatcher PATTERN_PREFIX';scope=Xamarin" title="Android.OS.PatternMatcher.PATTERN_PREFIX">Android.OS.PatternMatcher.PATTERN_PREFIX</a></format>, or
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android OS PatternMatcher PATTERN_SIMPLE_GLOB';scope=Xamarin" title="Android.OS.PatternMatcher.PATTERN_SIMPLE_GLOB">Android.OS.PatternMatcher.PATTERN_SIMPLE_GLOB</a></format>.</param>
+            path, or a simple pattern, depending on &lt;var&gt;type&lt;/var&gt;.</param>
+        <param name="type">Determines how &lt;var&gt;path&lt;/var&gt; will be compared to
+            determine a match: either <c>PatternMatcher#PATTERN_LITERAL</c>,
+            <c>PatternMatcher#PATTERN_PREFIX</c>,
+            <c>PatternMatcher#PATTERN_SUFFIX</c>, or
+            <c>PatternMatcher#PATTERN_SIMPLE_GLOB</c>.</param>
         <summary>Add a new Intent data path to match against.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#addDataPath(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.addDataPath(java.lang.String, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <altmember cref="M:Android.Content.IntentFilter.MatchData(System.String, System.String, System.String)" />
@@ -492,14 +511,24 @@
       </Parameters>
       <Docs>
         <param name="ssp">Either a raw string that must exactly match the scheme specific part
- path, or a simple pattern, depending on <format type="text/html"><var>type</var></format>.</param>
-        <param name="type">Determines how <format type="text/html"><var>ssp</var></format> will be compared to
- determine a match: either <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android OS PatternMatcher PATTERN_LITERAL';scope=Xamarin" title="Android.OS.PatternMatcher.PATTERN_LITERAL">Android.OS.PatternMatcher.PATTERN_LITERAL</a></format>,
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android OS PatternMatcher PATTERN_PREFIX';scope=Xamarin" title="Android.OS.PatternMatcher.PATTERN_PREFIX">Android.OS.PatternMatcher.PATTERN_PREFIX</a></format>, or
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android OS PatternMatcher PATTERN_SIMPLE_GLOB';scope=Xamarin" title="Android.OS.PatternMatcher.PATTERN_SIMPLE_GLOB">Android.OS.PatternMatcher.PATTERN_SIMPLE_GLOB</a></format>.</param>
+            path, or a simple pattern, depending on &lt;var&gt;type&lt;/var&gt;.</param>
+        <param name="type">Determines how &lt;var&gt;ssp&lt;/var&gt; will be compared to
+            determine a match: either <c>PatternMatcher#PATTERN_LITERAL</c>,
+            <c>PatternMatcher#PATTERN_PREFIX</c>,
+            <c>PatternMatcher#PATTERN_SUFFIX</c>, or
+            <c>PatternMatcher#PATTERN_SIMPLE_GLOB</c>.</param>
         <summary>Add a new Intent data "scheme specific part" to match against.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#addDataSchemeSpecificPart(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.addDataSchemeSpecificPart(java.lang.String, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <altmember cref="M:Android.Content.IntentFilter.MatchData(System.String, System.String, System.String)" />
         <altmember cref="M:Android.Content.IntentFilter.AddDataScheme(System.String)" />
@@ -1424,11 +1453,21 @@
       <Docs>
         <param name="data">The data whose authority is being looked for.</param>
         <summary>Is the given data authority included in the filter?  Note that if the
- filter does not include any authorities, false will <i>always</i> be
- returned.</summary>
-        <returns>To be added.</returns>
+            filter does not include any authorities, false will &lt;em&gt;always&lt;/em&gt; be
+            returned.</summary>
+        <returns>Returns true if the data string matches an authority listed in the
+                    filter.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#hasDataAuthority(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.hasDataAuthority(android.net.Uri)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -1457,13 +1496,23 @@
       </Parameters>
       <Docs>
         <param name="data">The data path to look for.  This is without the scheme
-             prefix.</param>
+                        prefix.</param>
         <summary>Is the given data path included in the filter?  Note that if the
- filter does not include any paths, false will <i>always</i> be
- returned.</summary>
-        <returns>To be added.</returns>
+            filter does not include any paths, false will &lt;em&gt;always&lt;/em&gt; be
+            returned.</summary>
+        <returns>True if the data string matches a path listed in the
+                    filter.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#hasDataPath(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.hasDataPath(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -1536,11 +1585,21 @@
       <Docs>
         <param name="data">The scheme specific part that is being looked for.</param>
         <summary>Is the given data scheme specific part included in the filter?  Note that if the
- filter does not include any scheme specific parts, false will <i>always</i> be
- returned.</summary>
-        <returns>To be added.</returns>
+            filter does not include any scheme specific parts, false will &lt;em&gt;always&lt;/em&gt; be
+            returned.</summary>
+        <returns>Returns true if the data string matches a scheme specific part listed in the
+                    filter.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#hasDataSchemeSpecificPart(java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.hasDataSchemeSpecificPart(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1714,17 +1773,14 @@
         <Parameter Name="logTag" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <param name="type">To be added.</param>
-        <param name="scheme">To be added.</param>
-        <param name="data">To be added.</param>
-        <param name="categories">To be added.</param>
-        <param name="intent">The Intent to compare against.</param>
-        <param name="resolve">If true, the intent's type will be resolved by calling
-                           Intent.resolveType(); otherwise a simple match against
-                           Intent.type will be performed.</param>
+        <param name="action">The intent action to match against (Intent.getAction).</param>
+        <param name="type">The intent type to match against (Intent.resolveType()).</param>
+        <param name="scheme">The data scheme to match against (Intent.getScheme()).</param>
+        <param name="data">The data URI to match against (Intent.getData()).</param>
+        <param name="categories">The categories to match against
+                              (Intent.getCategories()).</param>
         <param name="logTag">Tag to use in debugging messages.</param>
-        <summary>Test whether this filter matches the given &lt;var&gt;intent&lt;/var&gt;.</summary>
+        <summary>Test whether this filter matches the given intent data.</summary>
         <returns>Returns either a valid match constant (a combination of
             <c>#MATCH_CATEGORY_MASK</c> and <c>#MATCH_ADJUSTMENT_MASK</c>),
             or one of the error codes <c>#NO_MATCH_TYPE</c> if the type didn't match,
@@ -1734,7 +1790,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/IntentFilter#match(android.content.ContentResolver,%20android.content.Intent,%20boolean,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.match(android.content.ContentResolver, android.content.Intent, boolean, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/IntentFilter#match(java.lang.String,%20java.lang.String,%20java.lang.String,%20android.net.Uri,%20java.util.Set,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.IntentFilter.match(java.lang.String, java.lang.String, java.lang.String, android.net.Uri, java.util.Set, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Content/IntentSender.xml b/docs/Mono.Android/en/Android.Content/IntentSender.xml
index 3974e7c171..d53fb87976 100644
--- a/docs/Mono.Android/en/Android.Content/IntentSender.xml
+++ b/docs/Mono.Android/en/Android.Content/IntentSender.xml
@@ -430,11 +430,6 @@
         <Parameter Name="requiredPermission" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="requiredPermission">Name of permission that a recipient of the PendingIntent
- is required to hold.  This is only valid for broadcast intents, and
- corresponds to the permission argument in
- <see cref="M:Android.Content.Context.SendBroadcast(Android.Content.Intent,System.String)" />.
- If null, no permission is required.</param>
         <param name="context">The Context of the caller.  This may be null if
             &lt;var&gt;intent&lt;/var&gt; is also null.</param>
         <param name="code">Result code to supply back to the IntentSender's target.</param>
@@ -446,6 +441,11 @@
         <param name="handler">Handler identifying the thread on which the callback
             should happen.  If null, the callback will happen from the thread
             pool of the process.</param>
+        <param name="requiredPermission">Name of permission that a recipient of the PendingIntent
+ is required to hold.  This is only valid for broadcast intents, and
+ corresponds to the permission argument in
+ <see cref="M:Android.Content.Context.SendBroadcast(Android.Content.Intent,System.String)" />.
+ If null, no permission is required.</param>
         <summary>Perform the operation associated with this IntentSender, allowing the
             caller to specify information about the Intent to use and be notified
             when the send has completed.</summary>
diff --git a/docs/Mono.Android/en/Android.Content/RestrictionEntry.xml b/docs/Mono.Android/en/Android.Content/RestrictionEntry.xml
index 9c0fdb9359..8dbddc9079 100644
--- a/docs/Mono.Android/en/Android.Content/RestrictionEntry.xml
+++ b/docs/Mono.Android/en/Android.Content/RestrictionEntry.xml
@@ -69,8 +69,6 @@
       </Parameters>
       <Docs>
         <param name="in">To be added.</param>
-        <param name="type">the restriction type.</param>
-        <param name="key">the unique key for this restriction</param>
         <summary>Constructor for specifying the type and key, with no initial value;</summary>
         <remarks>
           <para>
@@ -176,14 +174,13 @@
         <Parameter Name="selectedState" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="selectedState">To be added.</param>
-        <param name="type">the restriction type.</param>
         <param name="key">the unique key for this restriction</param>
-        <summary>Constructor for specifying the type and key, with no initial value;</summary>
+        <param name="selectedState">whether this restriction is selected or not</param>
+        <summary>Constructor for <c>#TYPE_BOOLEAN</c> type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -216,14 +213,13 @@
         <Parameter Name="selectedInt" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="selectedInt">To be added.</param>
-        <param name="type">the restriction type.</param>
         <param name="key">the unique key for this restriction</param>
-        <summary>Constructor for specifying the type and key, with no initial value;</summary>
+        <param name="selectedInt">the integer value of the restriction</param>
+        <summary>Constructor for <c>#TYPE_INTEGER</c> type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -255,14 +251,13 @@
         <Parameter Name="selectedString" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="selectedString">To be added.</param>
-        <param name="type">the restriction type.</param>
         <param name="key">the unique key for this restriction</param>
-        <summary>Constructor for specifying the type and key, with no initial value;</summary>
+        <param name="selectedString">the current value</param>
+        <summary>Constructor for <c>#TYPE_CHOICE</c> type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -295,14 +290,13 @@
         <Parameter Name="selectedStrings" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="selectedStrings">To be added.</param>
-        <param name="type">the restriction type.</param>
         <param name="key">the unique key for this restriction</param>
-        <summary>Constructor for specifying the type and key, with no initial value;</summary>
+        <param name="selectedStrings">the list of values that are currently selected</param>
+        <summary>Constructor for <c>#TYPE_MULTI_SELECT</c> type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#RestrictionEntry(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.RestrictionEntry(java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -944,13 +938,11 @@
       </Parameters>
       <Docs>
         <param name="choiceEntries">the list of user-visible choices.</param>
-        <param name="context">the application context, used for retrieving the resources.</param>
-        <param name="stringArrayResId">the resource id of a string array containing the possible entries.</param>
         <summary>Sets a list of strings that will be presented as choices to the user.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#setChoiceEntries(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.setChoiceEntries(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#setChoiceEntries(java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.setChoiceEntries(java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1029,15 +1021,12 @@
       </Parameters>
       <Docs>
         <param name="choiceValues">an array of Strings which will be the selected values for the user's
- selections.</param>
-        <param name="context">the application context for retrieving the resources.</param>
-        <param name="stringArrayResId">the resource id for a string array containing the possible values.</param>
-        <summary>Sets a list of string values that can be selected by the user, similar to
-            <c>#setChoiceValues(String[])</c>.</summary>
+            selections.</param>
+        <summary>Sets a list of string values that can be selected by the user.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#setChoiceValues(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.setChoiceValues(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/content/RestrictionEntry#setChoiceValues(java.lang.String[])" title="Reference documentation">Java documentation for <code>android.content.RestrictionEntry.setChoiceValues(java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database.Sqlite/ISQLiteCursorDriver.xml b/docs/Mono.Android/en/Android.Database.Sqlite/ISQLiteCursorDriver.xml
index d27b6e912b..cbf41d79c2 100644
--- a/docs/Mono.Android/en/Android.Database.Sqlite/ISQLiteCursorDriver.xml
+++ b/docs/Mono.Android/en/Android.Database.Sqlite/ISQLiteCursorDriver.xml
@@ -180,9 +180,9 @@
         <Parameter Name="bindArgs" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="bindArgs">To be added.</param>
         <param name="factory">The CursorFactory to use when creating the Cursors, or
                     null if standard SQLiteCursors should be returned.</param>
+        <param name="bindArgs">To be added.</param>
         <summary>Executes the query returning a Cursor over the result set.</summary>
         <returns>a Cursor over the result set</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteCursor.xml b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteCursor.xml
index 8e9bea609a..aba5d1b90f 100644
--- a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteCursor.xml
+++ b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteCursor.xml
@@ -127,16 +127,18 @@
         <Parameter Name="query" Type="Android.Database.Sqlite.SQLiteQuery" />
       </Parameters>
       <Docs>
-        <param name="db">To be added.</param>
         <param name="driver">To be added.</param>
+        <param name="db">a reference to a Database object that is already constructed
+                and opened. This param is not used any longer</param>
         <param name="editTable">the name of the table used for this query</param>
-        <param name="query">the <c>SQLiteQuery</c> object associated with this cursor object.</param>
+        <param name="query">the rest of the query terms
+                cursor is finalized</param>
         <summary>Execute a query and provide access to its result set through a Cursor
             interface.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteCursor#SQLiteCursor(android.database.sqlite.SQLiteCursorDriver,%20java.lang.String,%20android.database.sqlite.SQLiteQuery)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteCursor.SQLiteCursor(android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteCursor#SQLiteCursor(android.database.sqlite.SQLiteDatabase,%20android.database.sqlite.SQLiteCursorDriver,%20java.lang.String,%20android.database.sqlite.SQLiteQuery)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteCursor.SQLiteCursor(android.database.sqlite.SQLiteDatabase, android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml
index 09f75aa345..d1181ec18e 100644
--- a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml
+++ b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteDatabase.xml
@@ -945,15 +945,14 @@
         <Parameter Name="bindArgs" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="bindArgs">only byte[], String, Long and Double are supported in bindArgs.</param>
         <param name="sql">the SQL statement to be executed. Multiple statements separated by semicolons are
             not supported.</param>
-        <summary>Execute a single SQL statement that is NOT a SELECT
-            or any other SQL statement that returns data.</summary>
+        <param name="bindArgs">only byte[], String, Long and Double are supported in bindArgs.</param>
+        <summary>Execute a single SQL statement that is NOT a SELECT/INSERT/UPDATE/DELETE.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#execSQL(java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.execSQL(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#execSQL(java.lang.String,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.execSQL(java.lang.String, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1555,17 +1554,16 @@
         <Parameter Name="updateTable" Type="System.String" />
       </Parameters>
       <Docs>
+        <param name="table">an update on this table will trigger a sync time removal</param>
         <param name="foreignKey">this is the column in table whose value is an _id in
-          updateTable</param>
+                     updateTable</param>
         <param name="updateTable">this is the table that will have its _sync_dirty</param>
-        <param name="table">the table to mark as syncable</param>
-        <param name="deletedTable">The deleted table that corresponds to the
-                     syncable table</param>
-        <summary>Mark this table as syncable.</summary>
+        <summary>Mark this table as syncable, with the _sync_dirty residing in another
+            table.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#markTableSyncable(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.markTableSyncable(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#markTableSyncable(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.markTableSyncable(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1797,13 +1795,12 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="factory">an optional factory class that is called to instantiate a
-            cursor when query is called, or null for default</param>
-        <param name="flags">to control database access mode</param>
         <param name="path">path to database file to open and/or create.
             &lt;p&gt;&lt;strong&gt;Important:&lt;/strong&gt; The file should be constructed either from an absolute path or
             by using <c>android.content.Context#getDatabasePath(String)</c>.</param>
-        <param name="openParams">configuration parameters that are used for opening <c>SQLiteDatabase</c></param>
+        <param name="factory">an optional factory class that is called to instantiate a
+            cursor when query is called, or null for default</param>
+        <param name="flags">to control database access mode</param>
         <summary>Open the database according to the specified <c>OpenParams parameters</c></summary>
         <returns>the newly opened database</returns>
         <remarks>
@@ -1856,15 +1853,14 @@
         <Parameter Name="errorHandler" Type="Android.Database.IDatabaseErrorHandler" />
       </Parameters>
       <Docs>
+        <param name="path">path to database file to open and/or create.
+            &lt;p&gt;&lt;strong&gt;Important:&lt;/strong&gt; The file should be constructed either from an absolute path or
+            by using <c>android.content.Context#getDatabasePath(String)</c>.</param>
         <param name="factory">an optional factory class that is called to instantiate a
             cursor when query is called, or null for default</param>
         <param name="flags">to control database access mode</param>
         <param name="errorHandler">the <see cref="T:Android.Database.IDatabaseErrorHandler" /> obj to be used to handle corruption
  when sqlite reports database corruption</param>
-        <param name="path">path to database file to open and/or create.
-            &lt;p&gt;&lt;strong&gt;Important:&lt;/strong&gt; The file should be constructed either from an absolute path or
-            by using <c>android.content.Context#getDatabasePath(String)</c>.</param>
-        <param name="openParams">configuration parameters that are used for opening <c>SQLiteDatabase</c></param>
         <summary>Open the database according to the specified <c>OpenParams parameters</c></summary>
         <returns>the newly opened database</returns>
         <remarks>
@@ -2200,8 +2196,6 @@
         <Parameter Name="limit" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="limit">Limits the number of rows returned by the query,
-            formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
         <param name="table">The table name to compile the query against.</param>
         <param name="columns">A list of which columns to return. Passing null will
                        return all columns, which is discouraged to prevent reading
@@ -2223,13 +2217,15 @@
         <param name="orderBy">How to order the rows, formatted as an SQL ORDER BY clause
                        (excluding the ORDER BY itself). Passing null will use the
                        default sort order, which may be unordered.</param>
+        <param name="limit">Limits the number of rows returned by the query,
+                       formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
         <summary>Query the given table, returning a <c>Cursor</c> over the result set.</summary>
         <returns>A <c>Cursor</c> object, which is positioned before the first entry. Note that
             <c>Cursor</c>s are not synchronized, see the documentation for more details.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#query(java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#query(java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2274,8 +2270,6 @@
       </Parameters>
       <Docs>
         <param name="distinct">true if you want each row to be unique, false otherwise.</param>
-        <param name="limit">Limits the number of rows returned by the query,
-            formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
         <param name="table">The table name to compile the query against.</param>
         <param name="columns">A list of which columns to return. Passing null will
                        return all columns, which is discouraged to prevent reading
@@ -2297,13 +2291,15 @@
         <param name="orderBy">How to order the rows, formatted as an SQL ORDER BY clause
                        (excluding the ORDER BY itself). Passing null will use the
                        default sort order, which may be unordered.</param>
-        <summary>Query the given table, returning a <c>Cursor</c> over the result set.</summary>
+        <param name="limit">Limits the number of rows returned by the query,
+                       formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
+        <summary>Query the given URL, returning a <c>Cursor</c> over the result set.</summary>
         <returns>A <c>Cursor</c> object, which is positioned before the first entry. Note that
             <c>Cursor</c>s are not synchronized, see the documentation for more details.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#query(java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#query(boolean,%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2349,11 +2345,6 @@
       </Parameters>
       <Docs>
         <param name="distinct">true if you want each row to be unique, false otherwise.</param>
-        <param name="limit">Limits the number of rows returned by the query,
-            formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
-        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
- If the operation is canceled, then <see cref="T:Android.OS.OperationCanceledException" /> will be thrown
- when the query is executed.</param>
         <param name="table">The table name to compile the query against.</param>
         <param name="columns">A list of which columns to return. Passing null will
                        return all columns, which is discouraged to prevent reading
@@ -2375,13 +2366,18 @@
         <param name="orderBy">How to order the rows, formatted as an SQL ORDER BY clause
                        (excluding the ORDER BY itself). Passing null will use the
                        default sort order, which may be unordered.</param>
-        <summary>Query the given table, returning a <c>Cursor</c> over the result set.</summary>
+        <param name="limit">Limits the number of rows returned by the query,
+                       formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
+            If the operation is canceled, then <c>OperationCanceledException</c> will be thrown
+            when the query is executed.</param>
+        <summary>Query the given URL, returning a <c>Cursor</c> over the result set.</summary>
         <returns>A <c>Cursor</c> object, which is positioned before the first entry. Note that
             <c>Cursor</c>s are not synchronized, see the documentation for more details.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#query(java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#query(boolean,%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -2503,9 +2499,6 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
- If the operation is canceled, then <see cref="T:Android.OS.OperationCanceledException" /> will be thrown
- when the query is executed.</param>
         <param name="cursorFactory">the cursor factory to use, or null for the default factory</param>
         <param name="distinct">true if you want each row to be unique, false otherwise.</param>
         <param name="table">The table name to compile the query against.</param>
@@ -2531,6 +2524,9 @@
                        default sort order, which may be unordered.</param>
         <param name="limit">Limits the number of rows returned by the query,
                        formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
+ If the operation is canceled, then <see cref="T:Android.OS.OperationCanceledException" /> will be thrown
+ when the query is executed.</param>
         <summary>Query the given URL, returning a <c>Cursor</c> over the result set.</summary>
         <returns>A <c>Cursor</c> object, which is positioned before the first entry. Note that
             <c>Cursor</c>s are not synchronized, see the documentation for more details.</returns>
@@ -2621,20 +2617,20 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
- If the operation is canceled, then <see cref="T:Android.OS.OperationCanceledException" /> will be thrown
- when the query is executed.</param>
         <param name="sql">the SQL query. The SQL string must not be ; terminated</param>
         <param name="selectionArgs">You may include ?s in where clause in the query,
                 which will be replaced by the values from selectionArgs. The
                 values will be bound as Strings.</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
+            If the operation is canceled, then <c>OperationCanceledException</c> will be thrown
+            when the query is executed.</param>
         <summary>Runs the provided SQL and returns a <c>Cursor</c> over the result set.</summary>
         <returns>A <c>Cursor</c> object, which is positioned before the first entry. Note that
             <c>Cursor</c>s are not synchronized, see the documentation for more details.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#rawQuery(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.rawQuery(java.lang.String, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#rawQuery(java.lang.String,%20java.lang.String[],%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.rawQuery(java.lang.String, java.lang.String[], android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -2723,15 +2719,15 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
- If the operation is canceled, then <see cref="T:Android.OS.OperationCanceledException" /> will be thrown
- when the query is executed.</param>
         <param name="cursorFactory">the cursor factory to use, or null for the default factory</param>
         <param name="sql">the SQL query. The SQL string must not be ; terminated</param>
         <param name="selectionArgs">You may include ?s in where clause in the query,
                 which will be replaced by the values from selectionArgs. The
                 values will be bound as Strings.</param>
         <param name="editTable">the name of the first table, which is editable</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
+ If the operation is canceled, then <see cref="T:Android.OS.OperationCanceledException" /> will be thrown
+ when the query is executed.</param>
         <summary>Runs the provided SQL and returns a cursor over the result set.</summary>
         <returns>A <c>Cursor</c> object, which is positioned before the first entry. Note that
             <c>Cursor</c>s are not synchronized, see the documentation for more details.</returns>
@@ -3694,14 +3690,14 @@
       </Parameters>
       <Docs>
         <param name="sleepAfterYieldDelay">if &gt; 0, sleep this long before starting a new transaction if
-   the lock was actually yielded. This will allow other background threads to make some
-   more progress than they would if we started the transaction immediately.</param>
+              the lock was actually yielded. This will allow other background threads to make some
+              more progress than they would if we started the transaction immediately.</param>
         <summary>Temporarily end the transaction to let other threads run.</summary>
         <returns>true if the transaction was yielded</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#yieldIfContendedSafely()" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.yieldIfContendedSafely()</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#yieldIfContendedSafely(long)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteDatabase.yieldIfContendedSafely(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteOpenHelper.xml b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteOpenHelper.xml
index 05fddb6552..0b688ceb25 100644
--- a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteOpenHelper.xml
+++ b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteOpenHelper.xml
@@ -93,15 +93,12 @@
         <Parameter Name="version" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="factory">To be added.</param>
         <param name="context">to use for locating paths to the the database</param>
         <param name="name">of the database file, or null for an in-memory database</param>
+        <param name="factory">To be added.</param>
         <param name="version">number of the database (starting at 1); if the database is older,
                 <c>#onUpgrade</c> will be used to upgrade the database; if the database is
                 newer, <c>#onDowngrade</c> will be used to downgrade the database</param>
-        <param name="openParams">configuration parameters that are used for opening <c>SQLiteDatabase</c>.
-                   Please note that <c>SQLiteDatabase#CREATE_IF_NECESSARY</c> flag will always be
-                   set when the helper opens the database</param>
         <summary>Create a helper object to create, open, and/or manage a database.</summary>
         <remarks>
           <para>
@@ -188,16 +185,13 @@
         <Parameter Name="errorHandler" Type="Android.Database.IDatabaseErrorHandler" />
       </Parameters>
       <Docs>
-        <param name="factory">To be added.</param>
-        <param name="errorHandler">To be added.</param>
         <param name="context">to use for locating paths to the the database</param>
         <param name="name">of the database file, or null for an in-memory database</param>
+        <param name="factory">To be added.</param>
         <param name="version">number of the database (starting at 1); if the database is older,
                 <c>#onUpgrade</c> will be used to upgrade the database; if the database is
                 newer, <c>#onDowngrade</c> will be used to downgrade the database</param>
-        <param name="openParams">configuration parameters that are used for opening <c>SQLiteDatabase</c>.
-                   Please note that <c>SQLiteDatabase#CREATE_IF_NECESSARY</c> flag will always be
-                   set when the helper opens the database</param>
+        <param name="errorHandler">To be added.</param>
         <summary>Create a helper object to create, open, and/or manage a database.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteQueryBuilder.xml b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteQueryBuilder.xml
index 8e819c3245..0b4a1108ab 100644
--- a/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteQueryBuilder.xml
+++ b/docs/Mono.Android/en/Android.Database.Sqlite/SQLiteQueryBuilder.xml
@@ -415,7 +415,6 @@
         <Parameter Name="limit" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="selectionArgs">To be added.</param>
         <param name="projectionIn">A list of which columns to return. Passing
                null will return all columns, which is discouraged to
                prevent reading data from storage that isn't going to be
@@ -424,6 +423,7 @@
               formatted as an SQL <c>WHERE</c> clause (excluding the <c>WHERE</c>
               itself).  Passing null will return all rows for the given
               URL.</param>
+        <param name="selectionArgs">To be added.</param>
         <param name="groupBy">A filter declaring how to group rows, formatted
               as an SQL <c>GROUP BY</c> clause (excluding the <c>GROUP BY</c> itself).
               Passing null will cause the rows to not be grouped.</param>
@@ -444,7 +444,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#buildQuery(java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.buildQuery(java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#buildQuery(java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.buildQuery(java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -690,7 +690,6 @@
         <Parameter Name="having" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="selectionArgs">To be added.</param>
         <param name="typeDiscriminatorColumn">the name of the result column
               whose cells will contain the name of the table from which
               each row was drawn.</param>
@@ -715,6 +714,7 @@
               formatted as an SQL <c>WHERE</c> clause (excluding the <c>WHERE</c>
               itself).  Passing null will return all rows for the given
               URL.</param>
+        <param name="selectionArgs">To be added.</param>
         <param name="groupBy">A filter declaring how to group rows, formatted
               as an SQL <c>GROUP BY</c> clause (excluding the <c>GROUP BY</c> itself).
               Passing null will cause the rows to not be grouped.</param>
@@ -730,7 +730,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#buildUnionSubQuery(java.lang.String,%20java.lang.String[],%20java.util.Set,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#buildUnionSubQuery(java.lang.String,%20java.lang.String[],%20java.util.Set,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1162,8 +1162,6 @@
         <Parameter Name="limit" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="limit">Limits the number of rows returned by the query,
-   formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
         <param name="db">the database to query on</param>
         <param name="projectionIn">A list of which columns to return. Passing
               null will return all columns, which is discouraged to prevent
@@ -1186,13 +1184,15 @@
         <param name="sortOrder">How to order the rows, formatted as an SQL
               <c>ORDER BY</c> clause (excluding the <c>ORDER BY</c> itself). Passing null
               will use the default sort order, which may be unordered.</param>
+        <param name="limit">Limits the number of rows returned by the query,
+              formatted as <c>LIMIT</c> clause. Passing null denotes no <c>LIMIT</c> clause.</param>
         <summary>Perform a query by combining all current settings and the
             information passed into this method.</summary>
         <returns>a cursor over the result set</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#query(android.database.sqlite.SQLiteDatabase,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#query(android.database.sqlite.SQLiteDatabase,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1236,11 +1236,6 @@
         <Parameter Name="cancellationSignal" Type="Android.OS.CancellationSignal" />
       </Parameters>
       <Docs>
-        <param name="limit">Limits the number of rows returned by the query,
-   formatted as LIMIT clause. Passing null denotes no LIMIT clause.</param>
-        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
- If the operation is canceled, then <see cref="T:Android.OS.OperationCanceledException" /> will be thrown
- when the query is executed.</param>
         <param name="db">the database to query on</param>
         <param name="projectionIn">A list of which columns to return. Passing
               null will return all columns, which is discouraged to prevent
@@ -1263,13 +1258,18 @@
         <param name="sortOrder">How to order the rows, formatted as an SQL
               <c>ORDER BY</c> clause (excluding the <c>ORDER BY</c> itself). Passing null
               will use the default sort order, which may be unordered.</param>
+        <param name="limit">Limits the number of rows returned by the query,
+              formatted as <c>LIMIT</c> clause. Passing null denotes no <c>LIMIT</c> clause.</param>
+        <param name="cancellationSignal">A signal to cancel the operation in progress, or null if none.
+            If the operation is canceled, then <c>OperationCanceledException</c> will be thrown
+            when the query is executed.</param>
         <summary>Perform a query by combining all current settings and the
             information passed into this method.</summary>
         <returns>a cursor over the result set</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#query(android.database.sqlite.SQLiteDatabase,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder#query(android.database.sqlite.SQLiteDatabase,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.database.sqlite.SQLiteQueryBuilder.query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database/ContentObservable.xml b/docs/Mono.Android/en/Android.Database/ContentObservable.xml
index e8a31b9256..76019d179c 100644
--- a/docs/Mono.Android/en/Android.Database/ContentObservable.xml
+++ b/docs/Mono.Android/en/Android.Database/ContentObservable.xml
@@ -152,14 +152,13 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="uri">The Uri of the changed content, or null if unknown.
-</param>
         <param name="selfChange">True if this is a self-change notification.</param>
-        <summary>Invokes <c>ContentObserver#dispatchChange(boolean)</c> on each observer.</summary>
+        <param name="uri">The Uri of the changed content, or null if unknown.</param>
+        <summary>Invokes <c>ContentObserver#dispatchChange(boolean, Uri)</c> on each observer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/ContentObservable#dispatchChange(boolean)" title="Reference documentation">Java documentation for <code>android.database.ContentObservable.dispatchChange(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/ContentObservable#dispatchChange(boolean,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.database.ContentObservable.dispatchChange(boolean, android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database/ContentObserver.xml b/docs/Mono.Android/en/Android.Database/ContentObserver.xml
index 23fef7820c..6e501213f6 100644
--- a/docs/Mono.Android/en/Android.Database/ContentObserver.xml
+++ b/docs/Mono.Android/en/Android.Database/ContentObserver.xml
@@ -201,13 +201,12 @@
       </Parameters>
       <Docs>
         <param name="selfChange">True if this is a self-change notification.</param>
-        <param name="uri">The Uri of the changed content, or null if unknown.
-</param>
+        <param name="uri">The Uri of the changed content.</param>
         <summary>Dispatches a change notification to the observer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/ContentObserver#dispatchChange(boolean)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.dispatchChange(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/ContentObserver#dispatchChange(boolean,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.dispatchChange(boolean, android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -251,14 +250,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="selfChange">To be added.</param>
-        <param name="uri">To be added.</param>
-        <param name="flags">To be added.</param>
+        <param name="selfChange">True if this is a self-change notification.</param>
+        <param name="uri">The Uri of the changed content.</param>
+        <param name="flags">Flags indicating details about this change.</param>
         <summary>Dispatches a change notification to the observer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/ContentObserver#dispatchChange(boolean)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.dispatchChange(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/ContentObserver#dispatchChange(boolean,%20android.net.Uri,%20int)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.dispatchChange(boolean, android.net.Uri, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -301,14 +300,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="selfChange">To be added.</param>
-        <param name="uris">To be added.</param>
-        <param name="flags">To be added.</param>
+        <param name="selfChange">True if this is a self-change notification.</param>
+        <param name="uris">The Uri of the changed content.</param>
+        <param name="flags">Flags indicating details about this change.</param>
         <summary>Dispatches a change notification to the observer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/ContentObserver#dispatchChange(boolean)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.dispatchChange(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/ContentObserver#dispatchChange(boolean,%20java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.dispatchChange(boolean, java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -414,14 +413,13 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="uri">The Uri of the changed content, or null if unknown.
-</param>
         <param name="selfChange">True if this is a self-change notification.</param>
+        <param name="uri">The Uri of the changed content.</param>
         <summary>This method is called when a content change occurs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/ContentObserver#onChange(boolean)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.onChange(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/ContentObserver#onChange(boolean,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.onChange(boolean, android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -465,14 +463,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="flags">To be added.</param>
         <param name="selfChange">True if this is a self-change notification.</param>
+        <param name="uri">The Uri of the changed content.</param>
+        <param name="flags">Flags indicating details about this change.</param>
         <summary>This method is called when a content change occurs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/ContentObserver#onChange(boolean)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.onChange(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/ContentObserver#onChange(boolean,%20android.net.Uri,%20int)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.onChange(boolean, android.net.Uri, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -515,14 +513,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="uris">To be added.</param>
-        <param name="flags">To be added.</param>
         <param name="selfChange">True if this is a self-change notification.</param>
+        <param name="uris">The Uris of the changed content.</param>
+        <param name="flags">Flags indicating details about this change.</param>
         <summary>This method is called when a content change occurs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/ContentObserver#onChange(boolean)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.onChange(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/ContentObserver#onChange(boolean,%20java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>android.database.ContentObserver.onChange(boolean, java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database/CursorWindow.xml b/docs/Mono.Android/en/Android.Database/CursorWindow.xml
index 73c7d1b6ff..0e8da95cb2 100644
--- a/docs/Mono.Android/en/Android.Database/CursorWindow.xml
+++ b/docs/Mono.Android/en/Android.Database/CursorWindow.xml
@@ -71,13 +71,13 @@
         <Parameter Name="localWindow" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="localWindow">To be added.</param>
-        <param name="name">The name of the cursor window, or null if none.</param>
-        <summary>Creates a new empty cursor window and gives it a name.</summary>
+        <param name="localWindow">True if this window will be used in this process only,
+            false if it might be sent to another processes.  This argument is ignored.</param>
+        <summary>Creates a new empty cursor window.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/CursorWindow#CursorWindow(java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.CursorWindow.CursorWindow(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/CursorWindow#CursorWindow(boolean)" title="Reference documentation">Java documentation for <code>android.database.CursorWindow.CursorWindow(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -170,13 +170,16 @@
         <Parameter Name="windowSizeBytes" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="windowSizeBytes">To be added.</param>
         <param name="name">The name of the cursor window, or null if none.</param>
+        <param name="windowSizeBytes">Size of cursor window in bytes.
+            &lt;p&gt;&lt;strong&gt;Note:&lt;/strong&gt; Memory is dynamically allocated as data rows are added to the
+            window. Depending on the amount of data stored, the actual amount of memory allocated can be
+            lower than specified size, but cannot exceed it.</param>
         <summary>Creates a new empty cursor window and gives it a name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/CursorWindow#CursorWindow(java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.CursorWindow.CursorWindow(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/CursorWindow#CursorWindow(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>android.database.CursorWindow.CursorWindow(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database/DatabaseUtils.xml b/docs/Mono.Android/en/Android.Database/DatabaseUtils.xml
index 61c76ba83e..f069645d7e 100644
--- a/docs/Mono.Android/en/Android.Database/DatabaseUtils.xml
+++ b/docs/Mono.Android/en/Android.Database/DatabaseUtils.xml
@@ -282,13 +282,13 @@
       <Docs>
         <param name="prog">To be added.</param>
         <param name="selectionArgs">To be added.</param>
-        <summary>Utility method to run the query on the db and return the blob value in the
+        <summary>Utility method to run the pre-compiled query and return the blob value in the
             first column of the first row.</summary>
         <returns>A read-only file descriptor for a copy of the blob value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#blobFileDescriptorForQuery(android.database.sqlite.SQLiteDatabase,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.blobFileDescriptorForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#blobFileDescriptorForQuery(android.database.sqlite.SQLiteStatement,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.blobFileDescriptorForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -685,16 +685,15 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="key">The key to store the value with in the map
-</param>
         <param name="cursor">The cursor to read from</param>
         <param name="field">The INTEGER field to read</param>
         <param name="values">The <c>ContentValues</c> to put the value into, with the field as the key</param>
-        <summary>Reads an Integer out of a field in a Cursor and writes it to a Map.</summary>
+        <param name="key">The key to store the value with in the map</param>
+        <summary>Reads a Integer out of a field in a Cursor and writes it to a Map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#cursorIntToContentValues(android.database.Cursor,%20java.lang.String,%20android.content.ContentValues)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#cursorIntToContentValues(android.database.Cursor,%20java.lang.String,%20android.content.ContentValues,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -820,16 +819,15 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="key">The key to store the value with in the map
-</param>
         <param name="cursor">The cursor to read from</param>
         <param name="field">The INTEGER field to read</param>
-        <param name="values">The <c>ContentValues</c> to put the value into, with the field as the key</param>
+        <param name="values">The <c>ContentValues</c> to put the value into</param>
+        <param name="key">The key to store the value with in the map</param>
         <summary>Reads a Long out of a field in a Cursor and writes it to a Map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#cursorLongToContentValues(android.database.Cursor,%20java.lang.String,%20android.content.ContentValues)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#cursorLongToContentValues(android.database.Cursor,%20java.lang.String,%20android.content.ContentValues,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1041,16 +1039,15 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="key">The key to store the value with in the map
-</param>
         <param name="cursor">The cursor to read from</param>
         <param name="field">The TEXT field to read</param>
         <param name="values">The <c>ContentValues</c> to put the value into, with the field as the key</param>
+        <param name="key">The key to store the value with in the map</param>
         <summary>Reads a String out of a field in a Cursor and writes it to a Map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#cursorStringToContentValues(android.database.Cursor,%20java.lang.String,%20android.content.ContentValues)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#cursorStringToContentValues(android.database.Cursor,%20java.lang.String,%20android.content.ContentValues,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1216,14 +1213,13 @@
         <Parameter Name="stream" Type="Java.IO.PrintStream" />
       </Parameters>
       <Docs>
-        <param name="stream">the stream to print to
-</param>
-        <param name="cursor">the cursor to print from</param>
-        <summary>Prints the contents of a Cursor's current row to System.</summary>
+        <param name="cursor">the cursor to print</param>
+        <param name="stream">the stream to print to</param>
+        <summary>Prints the contents of a Cursor's current row to a PrintSteam.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCurrentRow(android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCurrentRow(android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCurrentRow(android.database.Cursor,%20java.io.PrintStream)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCurrentRow(android.database.Cursor, java.io.PrintStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -1259,14 +1255,13 @@
         <Parameter Name="sb" Type="Java.Lang.StringBuilder" />
       </Parameters>
       <Docs>
-        <param name="sb">the StringBuilder to print to
-</param>
-        <param name="cursor">the cursor to print from</param>
-        <summary>Prints the contents of a Cursor's current row to System.</summary>
+        <param name="cursor">the cursor to print</param>
+        <param name="sb">the StringBuilder to print to</param>
+        <summary>Prints the contents of a Cursor's current row to a StringBuilder.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCurrentRow(android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCurrentRow(android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCurrentRow(android.database.Cursor,%20java.lang.StringBuilder)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCurrentRow(android.database.Cursor, java.lang.StringBuilder)</code>.</a>
             </format>
           </para>
           <para>
@@ -1383,14 +1378,13 @@
         <Parameter Name="stream" Type="Java.IO.PrintStream" />
       </Parameters>
       <Docs>
-        <param name="stream">the stream to print to
-</param>
         <param name="cursor">the cursor to print</param>
-        <summary>Prints the contents of a Cursor to System.</summary>
+        <param name="stream">the stream to print to</param>
+        <summary>Prints the contents of a Cursor to a PrintSteam.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCursor(android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCursor(android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCursor(android.database.Cursor,%20java.io.PrintStream)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCursor(android.database.Cursor, java.io.PrintStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -1426,14 +1420,13 @@
         <Parameter Name="sb" Type="Java.Lang.StringBuilder" />
       </Parameters>
       <Docs>
-        <param name="sb">the StringBuilder to print to
-</param>
         <param name="cursor">the cursor to print</param>
-        <summary>Prints the contents of a Cursor to System.</summary>
+        <param name="sb">the StringBuilder to print to</param>
+        <summary>Prints the contents of a Cursor to a StringBuilder.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCursor(android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCursor(android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#dumpCursor(android.database.Cursor,%20java.lang.StringBuilder)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.dumpCursor(android.database.Cursor, java.lang.StringBuilder)</code>.</a>
             </format>
           </para>
           <para>
@@ -1674,13 +1667,13 @@
       <Docs>
         <param name="prog">To be added.</param>
         <param name="selectionArgs">To be added.</param>
-        <summary>Utility method to run the query on the db and return the value in the
+        <summary>Utility method to run the pre-compiled query and return the value in the
             first column of the first row.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#longForQuery(android.database.sqlite.SQLiteDatabase,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.longForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#longForQuery(android.database.sqlite.SQLiteStatement,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.longForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1806,17 +1799,17 @@
         <Parameter Name="selection" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="selection">A filter declaring which rows to return,
-              formatted as an SQL WHERE clause (excluding the WHERE itself).
-              Passing null will count all rows for the given table</param>
         <param name="db">the database the table is in</param>
         <param name="table">the name of the table to query</param>
+        <param name="selection">A filter declaring which rows to return,
+                         formatted as an SQL WHERE clause (excluding the WHERE itself).
+                         Passing null will count all rows for the given table</param>
         <summary>Query the table for the number of rows in the table.</summary>
-        <returns>the number of rows in the table</returns>
+        <returns>the number of rows in the table filtered by the selection</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#queryNumEntries(android.database.sqlite.SQLiteDatabase,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#queryNumEntries(android.database.sqlite.SQLiteDatabase,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1854,21 +1847,21 @@
         <Parameter Name="selectionArgs" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="selection">A filter declaring which rows to return,
-              formatted as an SQL WHERE clause (excluding the WHERE itself).
-              Passing null will count all rows for the given table</param>
-        <param name="selectionArgs">You may include ?s in selection,
-              which will be replaced by the values from selectionArgs,
-              in order that they appear in the selection.
-              The values will be bound as Strings.</param>
         <param name="db">the database the table is in</param>
         <param name="table">the name of the table to query</param>
+        <param name="selection">A filter declaring which rows to return,
+                         formatted as an SQL WHERE clause (excluding the WHERE itself).
+                         Passing null will count all rows for the given table</param>
+        <param name="selectionArgs">You may include ?s in selection,
+                         which will be replaced by the values from selectionArgs,
+                         in order that they appear in the selection.
+                         The values will be bound as Strings.</param>
         <summary>Query the table for the number of rows in the table.</summary>
-        <returns>the number of rows in the table</returns>
+        <returns>the number of rows in the table filtered by the selection</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#queryNumEntries(android.database.sqlite.SQLiteDatabase,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#queryNumEntries(android.database.sqlite.SQLiteDatabase,%20java.lang.String,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2056,13 +2049,13 @@
       <Docs>
         <param name="prog">To be added.</param>
         <param name="selectionArgs">To be added.</param>
-        <summary>Utility method to run the query on the db and return the value in the
+        <summary>Utility method to run the pre-compiled query and return the value in the
             first column of the first row.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#stringForQuery(android.database.sqlite.SQLiteDatabase,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.stringForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/DatabaseUtils#stringForQuery(android.database.sqlite.SQLiteStatement,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.DatabaseUtils.stringForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Database/MatrixCursor.xml b/docs/Mono.Android/en/Android.Database/MatrixCursor.xml
index 8c6037bbf1..d714bf03e5 100644
--- a/docs/Mono.Android/en/Android.Database/MatrixCursor.xml
+++ b/docs/Mono.Android/en/Android.Database/MatrixCursor.xml
@@ -116,14 +116,14 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
         <param name="columnNames">names of the columns, the ordering of which
              determines column ordering elsewhere in this cursor</param>
-        <summary>Constructs a new cursor.</summary>
+        <param name="initialCapacity">in rows</param>
+        <summary>Constructs a new cursor with the given initial capacity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/MatrixCursor#MatrixCursor(java.lang.String[])" title="Reference documentation">Java documentation for <code>android.database.MatrixCursor.MatrixCursor(java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/MatrixCursor#MatrixCursor(java.lang.String[],%20int)" title="Reference documentation">Java documentation for <code>android.database.MatrixCursor.MatrixCursor(java.lang.String[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -204,7 +204,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/database/MatrixCursor#addRow(java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.database.MatrixCursor.addRow(java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/database/MatrixCursor#addRow(java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.database.MatrixCursor.addRow(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml b/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml
index a4ff33616f..b521b648a4 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmErrorEvent.xml
@@ -148,15 +148,16 @@
         <Parameter Name="attributes" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Object&gt;" />
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
         <param name="uniqueId">Unique session identifier.</param>
         <param name="type">Type of the event. Must be any of the event types defined above.</param>
-        <param name="message">Message description. It can be null.</param>
+        <param name="message">Message description.</param>
+        <param name="attributes">Attributes for extensible information. Could be any
+            information provided by the plug-in. It can be null.</param>
         <summary>Creates a &lt;code&gt;DrmErrorEvent&lt;/code&gt; object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmErrorEvent#DrmErrorEvent(int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmErrorEvent.DrmErrorEvent(int, int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmErrorEvent#DrmErrorEvent(int,%20int,%20java.lang.String,%20java.util.HashMap)" title="Reference documentation">Java documentation for <code>android.drm.DrmErrorEvent.DrmErrorEvent(int, int, java.lang.String, java.util.HashMap)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmEvent.xml b/docs/Mono.Android/en/Android.Drm/DrmEvent.xml
index 0c46650eb5..3dd729cd54 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmEvent.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmEvent.xml
@@ -133,15 +133,15 @@
         <Parameter Name="attributes" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Object&gt;" />
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
         <param name="uniqueId">Unique session identifier.</param>
         <param name="type">Type of information.</param>
         <param name="message">Message description.</param>
+        <param name="attributes">Attributes for extensible information.</param>
         <summary>Creates a &lt;code&gt;DrmEvent&lt;/code&gt; object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmEvent#DrmEvent(int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmEvent.DrmEvent(int, int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmEvent#DrmEvent(int,%20int,%20java.lang.String,%20java.util.HashMap)" title="Reference documentation">Java documentation for <code>android.drm.DrmEvent.DrmEvent(int, int, java.lang.String, java.util.HashMap)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmInfo.xml b/docs/Mono.Android/en/Android.Drm/DrmInfo.xml
index 76451e642e..568dda1061 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmInfo.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmInfo.xml
@@ -95,15 +95,14 @@
         <Parameter Name="mimeType" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
         <param name="infoType">The type of information.</param>
-        <param name="path">The trigger data.</param>
+        <param name="data">The trigger data.</param>
         <param name="mimeType">The MIME type.</param>
         <summary>Creates a &lt;code&gt;DrmInfo&lt;/code&gt; object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmInfo#DrmInfo(int,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmInfo.DrmInfo(int, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmInfo#DrmInfo(int,%20byte[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmInfo.DrmInfo(int, byte[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml b/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml
index 62df7197b1..19702c13b5 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmInfoEvent.xml
@@ -149,16 +149,17 @@
         <Parameter Name="attributes" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Object&gt;" />
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
         <param name="uniqueId">Unique session identifier.</param>
         <param name="type">Type of the event. Must be any of the event types defined above,
-            or the constants defined in <c>DrmEvent</c>.</param>
+            or the constants defined in <c>DrmEvent</c></param>
         <param name="message">Message description. It can be null.</param>
+        <param name="attributes">Attributes for extensible information. Could be any
+            information provided by the plug-in.</param>
         <summary>Creates a &lt;code&gt;DrmInfoEvent&lt;/code&gt; object with the specified parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmInfoEvent#DrmInfoEvent(int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmInfoEvent.DrmInfoEvent(int, int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmInfoEvent#DrmInfoEvent(int,%20int,%20java.lang.String,%20java.util.HashMap)" title="Reference documentation">Java documentation for <code>android.drm.DrmInfoEvent.DrmInfoEvent(int, int, java.lang.String, java.util.HashMap)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml b/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml
index 1ea7c3b991..32ce300329 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmManagerClient.xml
@@ -330,14 +330,13 @@
       </Parameters>
       <Docs>
         <param name="path">Path of the content to be handled.</param>
-        <param name="uri">URI for the content to be handled.</param>
-        <param name="mimeType">MIME type of the object to be handled</param>
-        <summary>Checks whether the given MIME type or URI can be handled.</summary>
-        <returns>True if the given MIME type or URI can be handled; false if they cannot be handled.</returns>
+        <param name="mimeType">MIME type of the object to be handled.</param>
+        <summary>Checks whether the given MIME type or path can be handled.</summary>
+        <returns>True if the given MIME type or path can be handled; false if they cannot be handled.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#canHandle(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.canHandle(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#canHandle(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.canHandle(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -434,13 +433,12 @@
       </Parameters>
       <Docs>
         <param name="path">Path to the rights-protected content.</param>
-        <param name="uri">URI of the rights-protected content.</param>
-        <summary>Check whether the given content has valid rights.</summary>
+        <summary>Checks whether the given content has valid rights.</summary>
         <returns>An &lt;code&gt;int&lt;/code&gt; representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#checkRightsStatus(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.checkRightsStatus(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#checkRightsStatus(java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.checkRightsStatus(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -493,14 +491,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="action">The <see cref="T:Android.Drm.DrmStore.Action" /> to perform.</param>
-        <param name="uri">URI of the rights-protected content.</param>
-        <summary>Check whether the given content has valid rights.</summary>
+        <param name="uri">URI for the rights-protected content.</param>
+        <param name="action">The <c>DrmStore.Action</c> to perform.</param>
+        <summary>Checks whether the given rights-protected content has valid rights for the specified
+            <c>DrmStore.Action</c>.</summary>
         <returns>An &lt;code&gt;int&lt;/code&gt; representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#checkRightsStatus(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.checkRightsStatus(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#checkRightsStatus(android.net.Uri,%20int)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.checkRightsStatus(android.net.Uri, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -554,14 +553,14 @@
       </Parameters>
       <Docs>
         <param name="path">Path to the rights-protected content.</param>
-        <param name="action">The <see cref="T:Android.Drm.DrmStore.Action" /> to perform.</param>
-        <param name="uri">URI of the rights-protected content.</param>
-        <summary>Check whether the given content has valid rights.</summary>
+        <param name="action">The <c>DrmStore.Action</c> to perform.</param>
+        <summary>Checks whether the given rights-protected content has valid rights for the specified
+            <c>DrmStore.Action</c>.</summary>
         <returns>An &lt;code&gt;int&lt;/code&gt; representing the <c>DrmStore.RightsStatus</c> of the content.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#checkRightsStatus(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.checkRightsStatus(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#checkRightsStatus(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.checkRightsStatus(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -888,15 +887,15 @@
       </Parameters>
       <Docs>
         <param name="path">Path to the content from which you are retrieving DRM constraints.</param>
-        <param name="uri">URI for the content from which you are retrieving DRM constraints.</param>
         <param name="action">Action defined in <c>DrmStore.Action</c>.</param>
         <summary>Retrieves constraint information for rights-protected content.</summary>
         <returns>A <c>android.content.ContentValues</c> instance that contains
-            key-value pairs representing the constraints. Null in case of failure.</returns>
+            key-value pairs representing the constraints. Null in case of failure.
+            The keys are defined in <c>DrmStore.ConstraintsColumns</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getConstraints(android.net.Uri,%20int)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getConstraints(android.net.Uri, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getConstraints(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getConstraints(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -996,15 +995,14 @@
       </Parameters>
       <Docs>
         <param name="path">Path to the content or null.</param>
-        <param name="uri">URI for the content or null.</param>
         <param name="mimeType">MIME type of the content or null.</param>
         <summary>Retrieves the type of rights-protected object (for example, content object, rights
-            object, and so on) using the specified URI or MIME type.</summary>
+            object, and so on) using the specified path or MIME type.</summary>
         <returns>An &lt;code&gt;int&lt;/code&gt; that corresponds to a <c>DrmStore.DrmObjectType</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getDrmObjectType(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getDrmObjectType(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getDrmObjectType(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getDrmObjectType(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1089,14 +1087,13 @@
       </Parameters>
       <Docs>
         <param name="path">Path to the content from which you are retrieving metadata information.</param>
-        <param name="uri">URI for the content from which you are retrieving metadata information.</param>
         <summary>Retrieves metadata information for rights-protected content.</summary>
         <returns>A <c>android.content.ContentValues</c> instance that contains
-            key-value pairs representing the constraints. Null in case of failure.</returns>
+            key-value pairs representing the metadata. Null in case of failure.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getMetadata(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getMetadata(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getMetadata(java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getMetadata(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1181,13 +1178,12 @@
       </Parameters>
       <Docs>
         <param name="path">Path to the rights-protected content.</param>
-        <param name="uri">URI of the rights-protected content.</param>
         <summary>Retrieves the MIME type embedded in the original content.</summary>
-        <returns>MIME type of the original content, such as &lt;code&gt;video/mpeg&lt;/code&gt;.</returns>
+        <returns>The MIME type of the original content, such as &lt;code&gt;video/mpeg&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getOriginalMimeType(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getOriginalMimeType(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#getOriginalMimeType(java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.getOriginalMimeType(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1524,13 +1520,12 @@
       </Parameters>
       <Docs>
         <param name="path">Path to the rights-protected content.</param>
-        <param name="uri">URI for the rights-protected content.</param>
         <summary>Removes the rights associated with the given rights-protected content.</summary>
         <returns>ERROR_NONE for success; ERROR_UNKNOWN for failure.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#removeRights(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.removeRights(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmManagerClient#removeRights(java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmManagerClient.removeRights(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Drm/DrmRights.xml b/docs/Mono.Android/en/Android.Drm/DrmRights.xml
index 93d7b9d396..15c6730b52 100644
--- a/docs/Mono.Android/en/Android.Drm/DrmRights.xml
+++ b/docs/Mono.Android/en/Android.Drm/DrmRights.xml
@@ -107,15 +107,13 @@
         <Parameter Name="mimeType" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="rightsFile">To be added.</param>
-        <param name="data">A <c>ProcessedData</c> object containing rights information.
-                        Must not be null.</param>
-        <param name="mimeType">The MIME type. It must not be null or an empty string.</param>
+        <param name="rightsFile">File containing rights information.</param>
+        <param name="mimeType">MIME type. Must not be null or an empty string.</param>
         <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(android.drm.ProcessedData,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(android.drm.ProcessedData, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(java.io.File, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -175,15 +173,13 @@
         <Parameter Name="mimeType" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="rightsFilePath">To be added.</param>
-        <param name="data">A <c>ProcessedData</c> object containing rights information.
-                        Must not be null.</param>
-        <param name="mimeType">The MIME type. It must not be null or an empty string.</param>
+        <param name="rightsFilePath">Path to the file containing rights information.</param>
+        <param name="mimeType">MIME type. Must not be null or an empty string.</param>
         <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(android.drm.ProcessedData,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(android.drm.ProcessedData, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -221,16 +217,14 @@
         <Parameter Name="accountId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="rightsFilePath">To be added.</param>
-        <param name="accountId">To be added.</param>
-        <param name="data">A <c>ProcessedData</c> object containing rights information.
-                        Must not be null.</param>
-        <param name="mimeType">The MIME type. It must not be null or an empty string.</param>
+        <param name="rightsFilePath">Path to the file containing rights information.</param>
+        <param name="mimeType">MIME type. Must not be null or an empty string.</param>
+        <param name="accountId">Account ID of the user.</param>
         <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(android.drm.ProcessedData,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(android.drm.ProcessedData, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -269,17 +263,15 @@
         <Parameter Name="subscriptionId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="rightsFilePath">To be added.</param>
-        <param name="accountId">To be added.</param>
-        <param name="subscriptionId">To be added.</param>
-        <param name="data">A <c>ProcessedData</c> object containing rights information.
-                        Must not be null.</param>
-        <param name="mimeType">The MIME type. It must not be null or an empty string.</param>
+        <param name="rightsFilePath">Path to the file containing rights information.</param>
+        <param name="mimeType">MIME type. Must not be null or an empty string.</param>
+        <param name="accountId">Account ID of the user.</param>
+        <param name="subscriptionId">Subscription ID of the user.</param>
         <summary>Creates a &lt;code&gt;DrmRights&lt;/code&gt; object with the given parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(android.drm.ProcessedData,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(android.drm.ProcessedData, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/drm/DrmRights#DrmRights(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.drm.DrmRights.DrmRights(java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Gestures/Gesture.xml b/docs/Mono.Android/en/Android.Gestures/Gesture.xml
index f2e7eac9c2..f45e011d0d 100644
--- a/docs/Mono.Android/en/Android.Gestures/Gesture.xml
+++ b/docs/Mono.Android/en/Android.Gestures/Gesture.xml
@@ -585,19 +585,18 @@
         <Parameter Name="color" Type="Android.Graphics.Color" />
       </Parameters>
       <Docs>
+        <param name="numSample">To be added.</param>
+        <param name="color">To be added.</param>
         <param name="width">width of the target bitmap</param>
         <param name="height">height of the target bitmap</param>
         <param name="edge">the edge</param>
-        <param name="numSample">To be added.</param>
-        <param name="color">To be added.</param>
-        <param name="width&#xA;@param&#xA;@param">height</param>
-        <param name="inset&#xA;@param&#xA;@param">color</param>
+        <param name="numSample&#xA;@param&#xA;@param">color</param>
         <summary>Creates a bitmap of the gesture with a transparent background.</summary>
         <returns>the bitmap</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/gesture/Gesture#toBitmap(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.gesture.Gesture.toBitmap(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/gesture/Gesture#toBitmap(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.gesture.Gesture.toBitmap(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Gestures/GestureUtils.xml b/docs/Mono.Android/en/Android.Gestures/GestureUtils.xml
index 654f2e5475..3ec706c263 100644
--- a/docs/Mono.Android/en/Android.Gestures/GestureUtils.xml
+++ b/docs/Mono.Android/en/Android.Gestures/GestureUtils.xml
@@ -107,7 +107,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/gesture/GestureUtils#computeOrientedBoundingBox(java.util.ArrayList)" title="Reference documentation">Java documentation for <code>android.gesture.GestureUtils.computeOrientedBoundingBox(java.util.ArrayList)</code>.</a>
+              <a href="https://developer.android.com/reference/android/gesture/GestureUtils#computeOrientedBoundingBox(float[])" title="Reference documentation">Java documentation for <code>android.gesture.GestureUtils.computeOrientedBoundingBox(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -221,10 +221,10 @@
         <Parameter Name="keepAspectRatio" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="keepAspectRatio">if the scaling should keep the gesture's 
-        aspect ratio</param>
         <param name="gesture">the gesture to be sampled</param>
         <param name="bitmapSize">the size of the bitmap</param>
+        <param name="keepAspectRatio">if the scaling should keep the gesture's 
+                   aspect ratio</param>
         <summary>Samples the gesture spatially by rendering the gesture into a 2D 
             grayscale bitmap.</summary>
         <returns>a bitmapSize x bitmapSize grayscale bitmap that is represented 
@@ -233,7 +233,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/gesture/GestureUtils#spatialSampling(android.gesture.Gesture,%20int)" title="Reference documentation">Java documentation for <code>android.gesture.GestureUtils.spatialSampling(android.gesture.Gesture, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/gesture/GestureUtils#spatialSampling(android.gesture.Gesture,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.gesture.GestureUtils.spatialSampling(android.gesture.Gesture, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml
index 6e3fb88607..e2710b5e25 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/AdaptiveIconDrawable.xml
@@ -68,13 +68,13 @@
         <Parameter Name="foregroundDrawable" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="backgroundDrawable">To be added.</param>
-        <param name="foregroundDrawable">To be added.</param>
-        <summary>Constructor used for xml inflation.</summary>
+        <param name="backgroundDrawable">drawable that should be rendered in the background</param>
+        <param name="foregroundDrawable">drawable that should be rendered in the foreground</param>
+        <summary>Constructor used to dynamically create this drawable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable#AdaptiveIconDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.AdaptiveIconDrawable.AdaptiveIconDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable#AdaptiveIconDrawable(android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.AdaptiveIconDrawable.AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/BitmapDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/BitmapDrawable.xml
index 3cb5d6c9cd..25ce72c184 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/BitmapDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/BitmapDrawable.xml
@@ -96,11 +96,12 @@
       </Parameters>
       <Docs>
         <param name="res">To be added.</param>
-        <summary>Create an empty drawable, not dealing with density.</summary>
+        <summary>Create an empty drawable, setting initial target density based on
+            the display metrics of the resources.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable(android.content.res.Resources)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable(android.content.res.Resources)</code>.</a>
             </format>
           </para>
           <para>
@@ -137,11 +138,11 @@
       </Parameters>
       <Docs>
         <param name="bitmap">To be added.</param>
-        <summary>Create an empty drawable, not dealing with density.</summary>
+        <summary>Create drawable from a bitmap, not dealing with density.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable(android.graphics.Bitmap)</code>.</a>
             </format>
           </para>
           <para>
@@ -178,11 +179,11 @@
       </Parameters>
       <Docs>
         <param name="is">To be added.</param>
-        <summary>Create an empty drawable, not dealing with density.</summary>
+        <summary>Create a drawable by decoding a bitmap from the given input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable(java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -219,11 +220,11 @@
       </Parameters>
       <Docs>
         <param name="filepath">To be added.</param>
-        <summary>Create an empty drawable, not dealing with density.</summary>
+        <summary>Create a drawable by opening a given file path and decoding the bitmap.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable(java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -258,11 +259,12 @@
       <Docs>
         <param name="res">To be added.</param>
         <param name="bitmap">To be added.</param>
-        <summary>Create an empty drawable, not dealing with density.</summary>
+        <summary>Create drawable from a bitmap, setting initial target density based on
+            the display metrics of the resources.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable(android.content.res.Resources,%20android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable(android.content.res.Resources, android.graphics.Bitmap)</code>.</a>
             </format>
           </para>
           <para>
@@ -297,11 +299,11 @@
       <Docs>
         <param name="res">To be added.</param>
         <param name="is">To be added.</param>
-        <summary>Create an empty drawable, not dealing with density.</summary>
+        <summary>Create a drawable by decoding a bitmap from the given input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable(android.content.res.Resources,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable(android.content.res.Resources, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -336,11 +338,11 @@
       <Docs>
         <param name="res">To be added.</param>
         <param name="filepath">To be added.</param>
-        <summary>Create an empty drawable, not dealing with density.</summary>
+        <summary>Create a drawable by opening a given file path and decoding the bitmap.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#BitmapDrawable(android.content.res.Resources,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.BitmapDrawable(android.content.res.Resources, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -904,12 +906,11 @@
       </Parameters>
       <Docs>
         <param name="canvas">The Canvas from which the density scale must be obtained.</param>
-        <param name="density">The density scale for this drawable.</param>
-        <summary>Set the density at which this drawable will be rendered.</summary>
+        <summary>Set the density scale at which this drawable will be rendered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#setTargetDensity(int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.setTargetDensity(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#setTargetDensity(android.graphics.Canvas)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.setTargetDensity(android.graphics.Canvas)</code>.</a>
             </format>
           </para>
           <para>
@@ -947,12 +948,11 @@
       </Parameters>
       <Docs>
         <param name="metrics">The DisplayMetrics indicating the density scale for this drawable.</param>
-        <param name="density">The density scale for this drawable.</param>
-        <summary>Set the density at which this drawable will be rendered.</summary>
+        <summary>Set the density scale at which this drawable will be rendered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#setTargetDensity(int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.setTargetDensity(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable#setTargetDensity(android.util.DisplayMetrics)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.BitmapDrawable.setTargetDensity(android.util.DisplayMetrics)</code>.</a>
             </format>
           </para>
           <para>
@@ -1138,7 +1138,6 @@
         <ReturnType>Android.Graphics.Shader+TileMode</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="mode">The repeat mode for this drawable.</param>
         <summary>Indicates the repeat behavior of this drawable on the X axis. -or- Sets the repeat behavior of this drawable on the X axis.</summary>
         <value>
           <c>android.graphics.Shader.TileMode#CLAMP</c> if the bitmap does not repeat,
@@ -1192,7 +1191,6 @@
         <ReturnType>Android.Graphics.Shader+TileMode</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="mode">The repeat mode for this drawable.</param>
         <summary>Indicates the repeat behavior of this drawable on the Y axis. -or- Sets the repeat behavior of this drawable on the Y axis.</summary>
         <value>
           <c>android.graphics.Shader.TileMode#CLAMP</c> if the bitmap does not repeat,
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/ColorDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/ColorDrawable.xml
index 7f79c7b6cc..e66c3cb3ae 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/ColorDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/ColorDrawable.xml
@@ -87,12 +87,12 @@
         <Parameter Name="color" Type="Android.Graphics.Color" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Creates a new black ColorDrawable.</summary>
+        <param name="color">The color to draw.</param>
+        <summary>Creates a new ColorDrawable with the specified color.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/ColorDrawable#ColorDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.ColorDrawable.ColorDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/ColorDrawable#ColorDrawable(int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.ColorDrawable.ColorDrawable(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/Drawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/Drawable.xml
index 7337054080..0e27a93239 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/Drawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/Drawable.xml
@@ -245,7 +245,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/Drawable#setBounds(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Drawable.setBounds(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/Drawable#setBounds(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Drawable.setBounds(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -517,14 +517,14 @@
       </Parameters>
       <Docs>
         <param name="bounds">Rect to receive the drawable's bounds (allocated by the
-               caller).
-</param>
-        <summary>Return a copy of the drawable's bounds in a new Rect.</summary>
+                          caller).</param>
+        <summary>Return a copy of the drawable's bounds in the specified Rect (allocated
+            by the caller).</summary>
         <returns>A copy of the drawable's bounds</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/Drawable#copyBounds()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Drawable.copyBounds()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/Drawable#copyBounds(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Drawable.copyBounds(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -2630,13 +2630,13 @@
         <Parameter Name="colorFilter" Type="Android.Graphics.ColorFilter" />
       </Parameters>
       <Docs>
-        <param name="colorFilter">To be added.</param>
-        <summary>Specify a color and Porter-Duff mode to be the color filter for this
-            drawable.</summary>
+        <param name="colorFilter">The color filter to apply, or <c>null</c> to remove the
+                       existing color filter</param>
+        <summary>Specify an optional color filter for the drawable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/Drawable#setColorFilter(int,%20android.graphics.Mode)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Drawable.setColorFilter(int, android.graphics.Mode)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/Drawable#setColorFilter(android.graphics.ColorFilter)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Drawable.setColorFilter(android.graphics.ColorFilter)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/GradientDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/GradientDrawable.xml
index 60c138757d..00d6f401fa 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/GradientDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/GradientDrawable.xml
@@ -51,7 +51,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="state">Constant state from which the drawable inherits</param>
         <summary>Creates a new themed GradientDrawable based on the specified constant state.</summary>
         <remarks>
           <para>
@@ -91,7 +90,6 @@
       <Docs>
         <param name="orientation">To be added.</param>
         <param name="colors">To be added.</param>
-        <param name="state">Constant state from which the drawable inherits</param>
         <summary>Creates a new themed GradientDrawable based on the specified constant state.</summary>
         <remarks>
           <para>
@@ -709,12 +707,12 @@
       </Parameters>
       <Docs>
         <param name="colorStateList">The color state list used to fill the shape</param>
-        <param name="argb">The color used to fill the shape</param>
-        <summary>Changes this drawable to use a single color instead of a gradient.</summary>
+        <summary>Changes this drawable to use a single color state list instead of a
+            gradient.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setColor(int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setColor(android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setColor(android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
@@ -862,13 +860,14 @@
         <Parameter Name="offsets" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="offsets">To be added.</param>
         <param name="colors">an array containing 2 or more ARGB colors</param>
-        <summary>Sets the colors used to draw the gradient.</summary>
+        <param name="offsets">optional array of floating point parameters representing the positions
+                           of the colors. Null evenly disperses the colors</param>
+        <summary>Sets the colors and offsets used to draw the gradient.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setColors(int[])" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setColors(int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setColors(int[],%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setColors(int[], float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1297,14 +1296,13 @@
         <Parameter Name="colorStateList" Type="Android.Content.Res.ColorStateList" />
       </Parameters>
       <Docs>
-        <param name="colorStateList">The color state list of the stroke</param>
         <param name="width">The width in pixels of the stroke</param>
-        <param name="color">The color of the stroke</param>
-        <summary>Set the stroke width and color for the drawable.</summary>
+        <param name="colorStateList">The color state list of the stroke</param>
+        <summary>Set the stroke width and color state list for the drawable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setStroke(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setStroke(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setStroke(int,%20android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setStroke(int, android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
@@ -1385,16 +1383,15 @@
         <Parameter Name="dashGap" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="width">The width in pixels of the stroke</param>
         <param name="colorStateList">The color state list of the stroke</param>
         <param name="dashWidth">The length in pixels of the dashes, set to 0 to disable dashes</param>
         <param name="dashGap">The gap in pixels between dashes</param>
-        <param name="width">The width in pixels of the stroke</param>
-        <param name="color">The color of the stroke</param>
-        <summary>Set the stroke width and color for the drawable.</summary>
+        <summary>Set the stroke width and color state list for the drawable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setStroke(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setStroke(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setStroke(int,%20android.content.res.ColorStateList,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setStroke(int, android.content.res.ColorStateList, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1432,15 +1429,15 @@
         <Parameter Name="dashGap" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="dashWidth">The length in pixels of the dashes, set to 0 to disable dashes</param>
-        <param name="dashGap">The gap in pixels between dashes</param>
         <param name="width">The width in pixels of the stroke</param>
         <param name="color">The color of the stroke</param>
+        <param name="dashWidth">The length in pixels of the dashes, set to 0 to disable dashes</param>
+        <param name="dashGap">The gap in pixels between dashes</param>
         <summary>Set the stroke width and color for the drawable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setStroke(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setStroke(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable#setStroke(int,%20int,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.GradientDrawable.setStroke(int, int, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml
index 6de5798f15..80470ca2d9 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/Icon.xml
@@ -157,7 +157,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#createWithAdaptiveBitmapContentUri(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.createWithAdaptiveBitmapContentUri(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#createWithAdaptiveBitmapContentUri(java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.createWithAdaptiveBitmapContentUri(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -277,7 +277,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#createWithContentUri(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.createWithContentUri(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#createWithContentUri(java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.createWithContentUri(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -442,16 +442,14 @@
         <Parameter Name="resId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resPackage">To be added.</param>
-        <param name="context">The context for the application whose resources should be used to resolve the
-                           given resource ID.</param>
+        <param name="resPackage">Name of the package containing the resource in question</param>
         <param name="resId">ID of the drawable resource</param>
         <summary>Create an Icon pointing to a drawable resource.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#createWithResource(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.createWithResource(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#createWithResource(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.createWithResource(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -630,21 +628,19 @@
         <Parameter Name="andThen" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="andThen">To be added.</param>
         <param name="context">
-          <c>Context Context</c> in which to load the drawable; see
+          <c>android.content.Context Context</c> in which to load the drawable; see
                            <c>#loadDrawable(Context)</c></param>
-        <param name="listener">to be <c>OnDrawableLoadedListener#onDrawableLoaded notified</c> when
-                            <c>#loadDrawable(Context)</c> finished</param>
-        <param name="handler">
-          <c>Handler</c> on which to notify the <c>listener</c></param>
-        <summary>Invokes <c>#loadDrawable(Context)</c> on a background thread and notifies the &lt;code&gt;
-            <c>OnDrawableLoadedListener#onDrawableLoaded listener</c>&lt;/code&gt; on the <c>handler</c>
-            when finished.</summary>
+        <param name="andThen">
+          <c>android.os.Message</c> to send to its target once the drawable
+                           is available. The <c>android.os.Message#obj obj</c>
+                           property is populated with the Drawable.</param>
+        <summary>Invokes <c>#loadDrawable(Context)</c> on the given <c>android.os.Handler Handler</c>
+            and then sends &lt;code&gt;andThen&lt;/code&gt; to the same Handler when finished.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#loadDrawableAsync(android.content.Context,%20android.graphics.drawable.OnDrawableLoadedListener,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.loadDrawableAsync(android.content.Context, android.graphics.drawable.OnDrawableLoadedListener, android.os.Handler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/Icon#loadDrawableAsync(android.content.Context,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.Icon.loadDrawableAsync(android.content.Context, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/InsetDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/InsetDrawable.xml
index d52111f43e..19b43bf94a 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/InsetDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/InsetDrawable.xml
@@ -68,13 +68,13 @@
         <Parameter Name="inset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="inset">To be added.</param>
-        <summary>No-arg constructor used by drawable inflation.</summary>
+        <param name="drawable">The drawable to inset.</param>
+        <param name="inset">Inset in pixels around the drawable.</param>
+        <summary>Creates a new inset drawable with the specified inset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable(android.graphics.drawable.Drawable,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable(android.graphics.drawable.Drawable, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -107,13 +107,13 @@
         <Parameter Name="inset" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="inset">To be added.</param>
-        <summary>No-arg constructor used by drawable inflation.</summary>
+        <param name="drawable">The drawable to inset.</param>
+        <param name="inset">Inset in fraction (range: [0, 1)) of the inset content bounds.</param>
+        <summary>Creates a new inset drawable with the specified inset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable(android.graphics.drawable.Drawable,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable(android.graphics.drawable.Drawable, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -171,16 +171,16 @@
         <Parameter Name="insetBottom" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="insetLeft">To be added.</param>
-        <param name="insetTop">To be added.</param>
-        <param name="insetRight">To be added.</param>
-        <param name="insetBottom">To be added.</param>
-        <summary>No-arg constructor used by drawable inflation.</summary>
+        <param name="drawable">The drawable to inset.</param>
+        <param name="insetLeft">Left inset in pixels.</param>
+        <param name="insetTop">Top inset in pixels.</param>
+        <param name="insetRight">Right inset in pixels.</param>
+        <param name="insetBottom">Bottom inset in pixels.</param>
+        <summary>Creates a new inset drawable with the specified insets in pixels.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable(android.graphics.drawable.Drawable,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -216,16 +216,16 @@
         <Parameter Name="insetBottomFraction" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="insetLeftFraction">To be added.</param>
-        <param name="insetTopFraction">To be added.</param>
-        <param name="insetRightFraction">To be added.</param>
-        <param name="insetBottomFraction">To be added.</param>
-        <summary>No-arg constructor used by drawable inflation.</summary>
+        <param name="drawable">The drawable to inset.</param>
+        <param name="insetLeftFraction">Left inset in fraction (range: [0, 1)) of the inset content bounds.</param>
+        <param name="insetTopFraction">Top inset in fraction (range: [0, 1)) of the inset content bounds.</param>
+        <param name="insetRightFraction">Right inset in fraction (range: [0, 1)) of the inset content bounds.</param>
+        <param name="insetBottomFraction">Bottom inset in fraction (range: [0, 1)) of the inset content bounds.</param>
+        <summary>Creates a new inset drawable with the specified insets in fraction of the view bounds.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/InsetDrawable#InsetDrawable(android.graphics.drawable.Drawable,%20float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.InsetDrawable.InsetDrawable(android.graphics.drawable.Drawable, float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/LayerDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/LayerDrawable.xml
index 09dd91a1a6..563eceb083 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/LayerDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/LayerDrawable.xml
@@ -67,12 +67,13 @@
         <Parameter Name="layers" Type="Android.Graphics.Drawables.Drawable[]" />
       </Parameters>
       <Docs>
-        <param name="layers">To be added.</param>
-        <summary>The one constructor to rule them all.</summary>
+        <param name="layers">a list of drawables to use as layers in this new drawable,
+                          must be non-null</param>
+        <summary>Creates a new layer drawable with the list of specified layers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable#LayerDrawable(android.graphics.drawable.LayerState,%20android.content.res.Resources)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.LayerDrawable.LayerDrawable(android.graphics.drawable.LayerState, android.content.res.Resources)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable#LayerDrawable(android.graphics.drawable.Drawable[])" title="Reference documentation">Java documentation for <code>android.graphics.drawable.LayerDrawable.LayerDrawable(android.graphics.drawable.Drawable[])</code>.</a>
             </format>
           </para>
           <para>
@@ -130,14 +131,14 @@
         <Parameter Name="dr" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="dr">To be added.</param>
-        <param name="layer">The layer to add.</param>
-        <summary>Adds a new layer at the end of list of layers and returns its index.</summary>
-        <returns>The index of the layer.</returns>
+        <param name="dr">The drawable to add as a new layer.</param>
+        <summary>Adds a new layer containing the specified <c>drawable</c> to the end of
+            the layer list and returns its index.</summary>
+        <returns>The index of the new layer.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable#addLayer(android.graphics.drawable.ChildDrawable)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.LayerDrawable.addLayer(android.graphics.drawable.ChildDrawable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable#addLayer(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.LayerDrawable.addLayer(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/NinePatchDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/NinePatchDrawable.xml
index c8afa28fce..94aedcae20 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/NinePatchDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/NinePatchDrawable.xml
@@ -59,12 +59,11 @@
       </Parameters>
       <Docs>
         <param name="patch">To be added.</param>
-        <summary>Create drawable from raw nine-patch data, setting initial target density
-            based on the display metrics of the resources.</summary>
+        <summary>Create drawable from existing nine-patch, not dealing with density.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.content.res.Resources,%20android.graphics.Bitmap,%20byte[],%20android.graphics.Rect,%20android.graphics.Rect,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, android.graphics.Rect, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.graphics.NinePatch)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.graphics.NinePatch)</code>.</a>
             </format>
           </para>
           <para>
@@ -99,12 +98,12 @@
       <Docs>
         <param name="res">To be added.</param>
         <param name="patch">To be added.</param>
-        <summary>Create drawable from raw nine-patch data, setting initial target density
+        <summary>Create drawable from existing nine-patch, setting initial target density
             based on the display metrics of the resources.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.content.res.Resources,%20android.graphics.Bitmap,%20byte[],%20android.graphics.Rect,%20android.graphics.Rect,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, android.graphics.Rect, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.content.res.Resources,%20android.graphics.NinePatch)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.content.res.Resources, android.graphics.NinePatch)</code>.</a>
             </format>
           </para>
           <para>
@@ -170,12 +169,11 @@
         <param name="chunk">To be added.</param>
         <param name="padding">To be added.</param>
         <param name="srcName">To be added.</param>
-        <summary>Create drawable from raw nine-patch data, setting initial target density
-            based on the display metrics of the resources.</summary>
+        <summary>Create drawable from raw nine-patch data, not dealing with density.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.content.res.Resources,%20android.graphics.Bitmap,%20byte[],%20android.graphics.Rect,%20android.graphics.Rect,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, android.graphics.Rect, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.graphics.Bitmap,%20byte[],%20android.graphics.Rect,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -221,7 +219,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.content.res.Resources,%20android.graphics.Bitmap,%20byte[],%20android.graphics.Rect,%20android.graphics.Rect,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, android.graphics.Rect, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#NinePatchDrawable(android.content.res.Resources,%20android.graphics.Bitmap,%20byte[],%20android.graphics.Rect,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -442,12 +440,11 @@
       </Parameters>
       <Docs>
         <param name="canvas">The Canvas from which the density scale must be obtained.</param>
-        <param name="density">The density scale for this drawable.</param>
-        <summary>Set the density at which this drawable will be rendered.</summary>
+        <summary>Set the density scale at which this drawable will be rendered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#setTargetDensity(int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.setTargetDensity(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#setTargetDensity(android.graphics.Canvas)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.setTargetDensity(android.graphics.Canvas)</code>.</a>
             </format>
           </para>
           <para>
@@ -485,12 +482,11 @@
       </Parameters>
       <Docs>
         <param name="metrics">The DisplayMetrics indicating the density scale for this drawable.</param>
-        <param name="density">The density scale for this drawable.</param>
-        <summary>Set the density at which this drawable will be rendered.</summary>
+        <summary>Set the density scale at which this drawable will be rendered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#setTargetDensity(int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.setTargetDensity(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable#setTargetDensity(android.util.DisplayMetrics)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.NinePatchDrawable.setTargetDensity(android.util.DisplayMetrics)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/RippleDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/RippleDrawable.xml
index ba0e6438aa..5f3738d908 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/RippleDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/RippleDrawable.xml
@@ -78,14 +78,15 @@
         <Parameter Name="mask" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="color">The ripple color.</param>
-        <param name="content">The content drawable, may be <c>null</c>.</param>
-        <param name="mask">The mask drawable, may be <c>null</c>.</param>
-        <summary>Constructor used for drawable inflation.</summary>
+        <param name="color">The ripple color</param>
+        <param name="content">The content drawable, may be <c>null</c></param>
+        <param name="mask">The mask drawable, may be <c>null</c></param>
+        <summary>Creates a new ripple drawable with the specified ripple color and
+            optional content and mask drawables.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable#RippleDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.RippleDrawable.RippleDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable#RippleDrawable(android.content.res.ColorStateList,%20android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.RippleDrawable.RippleDrawable(android.content.res.ColorStateList, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/ShapeDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/ShapeDrawable.xml
index ffb0ecc3d4..8f67deb69e 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/ShapeDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/ShapeDrawable.xml
@@ -87,12 +87,12 @@
         <Parameter Name="s" Type="Android.Graphics.Drawables.Shapes.Shape" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>ShapeDrawable constructor.</summary>
+        <param name="s">the Shape that this ShapeDrawable should be</param>
+        <summary>Creates a ShapeDrawable with a specified Shape.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable#ShapeDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.ShapeDrawable.ShapeDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable#ShapeDrawable(android.graphics.drawable.shapes.Shape)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.ShapeDrawable.ShapeDrawable(android.graphics.drawable.shapes.Shape)</code>.</a>
             </format>
           </para>
           <para>
@@ -562,15 +562,11 @@
       </Parameters>
       <Docs>
         <param name="padding">To be added.</param>
-        <param name="left">padding for the left side (in pixels)</param>
-        <param name="top">padding for the top (in pixels)</param>
-        <param name="right">padding for the right side (in pixels)</param>
-        <param name="bottom">padding for the bottom (in pixels)</param>
-        <summary>Sets padding for the shape.</summary>
+        <summary>Sets padding for this shape, defined by a Rect object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable#setPadding(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.ShapeDrawable.setPadding(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable#setPadding(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.drawable.ShapeDrawable.setPadding(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Drawables/TransitionDrawable.xml b/docs/Mono.Android/en/Android.Graphics.Drawables/TransitionDrawable.xml
index d09efee0bd..5a0f89e6c4 100644
--- a/docs/Mono.Android/en/Android.Graphics.Drawables/TransitionDrawable.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Drawables/TransitionDrawable.xml
@@ -69,11 +69,11 @@
       </Parameters>
       <Docs>
         <param name="layers">To be added.</param>
-        <summary>Create a new transition drawable with no layer.</summary>
+        <summary>Create a new transition drawable with the specified list of layers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/drawable/TransitionDrawable#TransitionDrawable()" title="Reference documentation">Java documentation for <code>android.graphics.drawable.TransitionDrawable.TransitionDrawable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/drawable/TransitionDrawable#TransitionDrawable(android.graphics.drawable.Drawable[])" title="Reference documentation">Java documentation for <code>android.graphics.drawable.TransitionDrawable.TransitionDrawable(android.graphics.drawable.Drawable[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Fonts/FontStyle.xml b/docs/Mono.Android/en/Android.Graphics.Fonts/FontStyle.xml
index 482605a731..e616979243 100644
--- a/docs/Mono.Android/en/Android.Graphics.Fonts/FontStyle.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Fonts/FontStyle.xml
@@ -50,8 +50,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="weight">a weight value</param>
-        <param name="slant">a slant value</param>
         <summary>Create FontStyle with specific weight and italic</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics.Fonts/FontVariationAxis.xml b/docs/Mono.Android/en/Android.Graphics.Fonts/FontVariationAxis.xml
index 58fe7b607a..fcc1de7866 100644
--- a/docs/Mono.Android/en/Android.Graphics.Fonts/FontVariationAxis.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Fonts/FontVariationAxis.xml
@@ -300,11 +300,20 @@
         <Parameter Name="axes" Type="Android.Graphics.Fonts.FontVariationAxis[]" />
       </Parameters>
       <Docs>
-        <param name="axes">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="axes">an array of FontVariationAxis.</param>
+        <summary>Stringify the array of FontVariationAxis.</summary>
+        <returns>String a valid font variation settings string.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/fonts/FontVariationAxis#toFontVariationSettings(android.graphics.fonts.FontVariationAxis[])" title="Reference documentation">Java documentation for <code>android.graphics.fonts.FontVariationAxis.toFontVariationSettings(android.graphics.fonts.FontVariationAxis[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.Graphics.Text/TextRunShaper.xml b/docs/Mono.Android/en/Android.Graphics.Text/TextRunShaper.xml
index 7aa05e9f18..bbc858a122 100644
--- a/docs/Mono.Android/en/Android.Graphics.Text/TextRunShaper.xml
+++ b/docs/Mono.Android/en/Android.Graphics.Text/TextRunShaper.xml
@@ -170,7 +170,7 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="text">a text buffer to be shaped. Any styled spans stored in this text are ignored.</param>
+        <param name="text">a text buffer to be shaped</param>
         <param name="start">a start index of shaping target in the buffer.</param>
         <param name="count">a length of shaping target in the buffer.</param>
         <param name="contextStart">a start index of context used for shaping in the buffer.</param>
@@ -180,11 +180,11 @@
         <param name="isRtl">true if this text is shaped for RTL direction, false otherwise.</param>
         <param name="paint">a paint used for shaping text.</param>
         <summary>Shape non-styled text.</summary>
-        <returns>a shape result</returns>
+        <returns>a shape result.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/text/TextRunShaper#shapeTextRun(java.lang.CharSequence,%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.text.TextRunShaper.shapeTextRun(java.lang.CharSequence, int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/text/TextRunShaper#shapeTextRun(char[],%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.text.TextRunShaper.shapeTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Bitmap.xml b/docs/Mono.Android/en/Android.Graphics/Bitmap.xml
index 9b49ac7fb0..11bdcb6d18 100644
--- a/docs/Mono.Android/en/Android.Graphics/Bitmap.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Bitmap.xml
@@ -481,10 +481,19 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary tool="true">Returns an immutable bitmap from the source bitmap.</summary>
+        <summary>Returns a bitmap from the source bitmap.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#createBitmap(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.createBitmap(android.graphics.Bitmap)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -512,10 +521,23 @@
         <Parameter Name="source" Type="Android.Graphics.Picture" />
       </Parameters>
       <Docs>
-        <param name="source">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="source">The recorded <c>Picture</c> of drawing commands that will be
+                          drawn into the returned Bitmap.</param>
+        <summary>Creates a Bitmap from the given <c>Picture</c> source of recorded drawing commands.</summary>
+        <returns>An immutable bitmap with a HARDWARE config whose contents are created
+            from the recorded drawing commands in the Picture source.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#createBitmap(android.graphics.Picture)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.createBitmap(android.graphics.Picture)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="CreateBitmap">
@@ -1356,12 +1378,12 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Fills the bitmap's pixels with the specified <c>Color</c>.</summary>
+        <param name="color">The color to fill as packed by the <c>Color</c> class.</param>
+        <summary>Fills the bitmap's pixels with the specified <c>ColorLong</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Bitmap#eraseColor(int)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.eraseColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#eraseColor(long)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.eraseColor(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1435,16 +1457,19 @@
       </Parameters>
       <Docs>
         <param name="paint">Optional paint used to modify the alpha values in the
-              resulting bitmap. Pass null for default behavior.</param>
+                         resulting bitmap. Pass null for default behavior.</param>
         <param name="offsetXY">Optional array that returns the X (index 0) and Y
-                 (index 1) offset needed to position the returned bitmap
-                 so that it visually lines up with the original.</param>
+                            (index 1) offset needed to position the returned bitmap
+                            so that it visually lines up with the original.</param>
         <summary>Returns a new bitmap that captures the alpha values of the original.</summary>
-        <returns>new bitmap containing the alpha channel of the original bitmap.</returns>
+        <returns>new bitmap containing the (optionally modified by paint) alpha
+                    channel of the original bitmap. This may be drawn with
+                    Canvas.drawBitmap(), where the color(s) will be taken from the
+                    paint that is passed to the draw call.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Bitmap#extractAlpha()" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.extractAlpha()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#extractAlpha(android.graphics.Paint,%20int[])" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.extractAlpha(android.graphics.Paint, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1755,14 +1780,13 @@
       </Parameters>
       <Docs>
         <param name="canvas">To be added.</param>
-        <param name="targetDensity">The density of the target canvas of the bitmap.</param>
-        <summary>Convenience method that returns the height of this bitmap divided
-            by the density scale factor.</summary>
+        <summary>Convenience for calling <c>#getScaledHeight(int)</c> with the target
+            density of the given <c>Canvas</c>.</summary>
         <returns>The scaled height of this bitmap, according to the density scale factor.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledHeight(int)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledHeight(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledHeight(android.graphics.Canvas)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledHeight(android.graphics.Canvas)</code>.</a>
             </format>
           </para>
           <para>
@@ -1798,14 +1822,13 @@
       </Parameters>
       <Docs>
         <param name="metrics">To be added.</param>
-        <param name="targetDensity">The density of the target canvas of the bitmap.</param>
-        <summary>Convenience method that returns the height of this bitmap divided
-            by the density scale factor.</summary>
+        <summary>Convenience for calling <c>#getScaledHeight(int)</c> with the target
+            density of the given <c>DisplayMetrics</c>.</summary>
         <returns>The scaled height of this bitmap, according to the density scale factor.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledHeight(int)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledHeight(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledHeight(android.util.DisplayMetrics)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledHeight(android.util.DisplayMetrics)</code>.</a>
             </format>
           </para>
           <para>
@@ -1883,14 +1906,13 @@
       </Parameters>
       <Docs>
         <param name="canvas">To be added.</param>
-        <param name="targetDensity">The density of the target canvas of the bitmap.</param>
-        <summary>Convenience method that returns the width of this bitmap divided
-            by the density scale factor.</summary>
+        <summary>Convenience for calling <c>#getScaledWidth(int)</c> with the target
+            density of the given <c>Canvas</c>.</summary>
         <returns>The scaled width of this bitmap, according to the density scale factor.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledWidth(int)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledWidth(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledWidth(android.graphics.Canvas)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledWidth(android.graphics.Canvas)</code>.</a>
             </format>
           </para>
           <para>
@@ -1926,14 +1948,13 @@
       </Parameters>
       <Docs>
         <param name="metrics">To be added.</param>
-        <param name="targetDensity">The density of the target canvas of the bitmap.</param>
-        <summary>Convenience method that returns the width of this bitmap divided
-            by the density scale factor.</summary>
+        <summary>Convenience for calling <c>#getScaledWidth(int)</c> with the target
+            density of the given <c>DisplayMetrics</c>.</summary>
         <returns>The scaled width of this bitmap, according to the density scale factor.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledWidth(int)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledWidth(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Bitmap#getScaledWidth(android.util.DisplayMetrics)" title="Reference documentation">Java documentation for <code>android.graphics.Bitmap.getScaledWidth(android.util.DisplayMetrics)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/BitmapFactory.xml b/docs/Mono.Android/en/Android.Graphics/BitmapFactory.xml
index 3da444717c..0df3f1c999 100644
--- a/docs/Mono.Android/en/Android.Graphics/BitmapFactory.xml
+++ b/docs/Mono.Android/en/Android.Graphics/BitmapFactory.xml
@@ -155,12 +155,12 @@
         <Parameter Name="opts" Type="Android.Graphics.BitmapFactory+Options" />
       </Parameters>
       <Docs>
-        <param name="opts">null-ok; Options that control downsampling and whether the
-             image should be completely decoded, or just is size returned.</param>
         <param name="data">byte array of compressed image data</param>
         <param name="offset">offset into imageData for where the decoder should begin
                           parsing.</param>
         <param name="length">the number of bytes, beginning at offset, to parse</param>
+        <param name="opts">null-ok; Options that control downsampling and whether the
+             image should be completely decoded, or just is size returned.</param>
         <summary>Decode an immutable bitmap from the specified byte array.</summary>
         <returns>The decoded bitmap, or null if the image could not be decoded.</returns>
         <remarks>
@@ -303,9 +303,9 @@
         <Parameter Name="opts" Type="Android.Graphics.BitmapFactory+Options" />
       </Parameters>
       <Docs>
+        <param name="pathName">complete path name for the file to be decoded.</param>
         <param name="opts">null-ok; Options that control downsampling and whether the
              image should be completely decoded, or just is size returned.</param>
-        <param name="pathName">complete path name for the file to be decoded.</param>
         <summary>Decode a file path into a bitmap.</summary>
         <returns>the resulting decoded bitmap, or null if it could not be decoded.</returns>
         <remarks>
@@ -441,13 +441,13 @@
         <Parameter Name="opts" Type="Android.Graphics.BitmapFactory+Options" />
       </Parameters>
       <Docs>
+        <param name="fd">The file descriptor containing the bitmap data to decode</param>
         <param name="outPadding">If not null, return the padding rect for the bitmap if
                    it exists, otherwise set padding to [-1,-1,-1,-1]. If
                    no bitmap is returned (null) then padding is
                    unchanged.</param>
         <param name="opts">null-ok; Options that control downsampling and whether the
              image should be completely decoded, or just its size returned.</param>
-        <param name="fd">The file descriptor containing the bitmap data to decode</param>
         <summary>Decode a bitmap from the file descriptor.</summary>
         <returns>the decoded bitmap, or null</returns>
         <remarks>
@@ -588,10 +588,10 @@
         <Parameter Name="opts" Type="Android.Graphics.BitmapFactory+Options" />
       </Parameters>
       <Docs>
-        <param name="opts">null-ok; Options that control downsampling and whether the
-             image should be completely decoded, or just is size returned.</param>
         <param name="res">The resources object containing the image data</param>
         <param name="id">The resource id of the image data</param>
+        <param name="opts">null-ok; Options that control downsampling and whether the
+             image should be completely decoded, or just is size returned.</param>
         <summary>Synonym for <c>#decodeResource(Resources, int, android.graphics.BitmapFactory.Options)</c>
             with null Options.</summary>
         <returns>The decoded bitmap, or null if the image could not be decoded.</returns>
@@ -815,14 +815,14 @@
         <Parameter Name="opts" Type="Android.Graphics.BitmapFactory+Options" />
       </Parameters>
       <Docs>
+        <param name="is">The input stream that holds the raw data to be decoded into a
+                      bitmap.</param>
         <param name="outPadding">If not null, return the padding rect for the bitmap if
                    it exists, otherwise set padding to [-1,-1,-1,-1]. If
                    no bitmap is returned (null) then padding is
                    unchanged.</param>
         <param name="opts">null-ok; Options that control downsampling and whether the
              image should be completely decoded, or just is size returned.</param>
-        <param name="is">The input stream that holds the raw data to be decoded into a
-                      bitmap.</param>
         <summary>Decode an input stream into a bitmap.</summary>
         <returns>The decoded bitmap, or null if the image data could not be decoded.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Graphics/BitmapRegionDecoder.xml b/docs/Mono.Android/en/Android.Graphics/BitmapRegionDecoder.xml
index d62e67fab8..404741b1c2 100644
--- a/docs/Mono.Android/en/Android.Graphics/BitmapRegionDecoder.xml
+++ b/docs/Mono.Android/en/Android.Graphics/BitmapRegionDecoder.xml
@@ -247,14 +247,14 @@
         <Parameter Name="is" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="is">To be added.</param>
-        <param name="pfd">The parcel file descriptor containing the data to decode</param>
-        <summary>Create a BitmapRegionDecoder from the file descriptor.</summary>
-        <returns>To be added.</returns>
+        <param name="is">The input stream that holds the raw data to be decoded into a
+                      BitmapRegionDecoder.</param>
+        <summary>Create a BitmapRegionDecoder from an input stream.</summary>
+        <returns>A new BitmapRegionDecoder, or <c>null</c> if <c>is</c> is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -288,14 +288,13 @@
         <Parameter Name="pathName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pathName">To be added.</param>
-        <param name="pfd">The parcel file descriptor containing the data to decode</param>
-        <summary>Create a BitmapRegionDecoder from the file descriptor.</summary>
+        <param name="pathName">complete path name for the file to be decoded.</param>
+        <summary>Create a BitmapRegionDecoder from a file path.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -335,20 +334,14 @@
       </Parameters>
       <Docs>
         <param name="fd">The file descriptor containing the data to decode</param>
-        <param name="isShareable">If this is true, then the BitmapRegionDecoder may keep a
-                    shallow reference to the input. If this is false,
-                    then the BitmapRegionDecoder will explicitly make a copy of the
-                    input data, and keep that. Even if sharing is allowed,
-                    the implementation may still decide to make a deep
-                    copy of the input data. If an image is progressively encoded,
-                    allowing sharing may degrade the decoding speed.</param>
-        <param name="pfd">The parcel file descriptor containing the data to decode</param>
+        <param name="isShareable">This field has been ignored since
+                               <c>Build.VERSION_CODES#KITKAT</c>.</param>
         <summary>Create a BitmapRegionDecoder from the file descriptor.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(java.io.FileDescriptor,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(java.io.FileDescriptor, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -391,21 +384,14 @@
       </Parameters>
       <Docs>
         <param name="is">The input stream that holds the raw data to be decoded into a
-           BitmapRegionDecoder.</param>
-        <param name="isShareable">If this is true, then the BitmapRegionDecoder may keep a
-                    shallow reference to the input. If this is false,
-                    then the BitmapRegionDecoder will explicitly make a copy of the
-                    input data, and keep that. Even if sharing is allowed,
-                    the implementation may still decide to make a deep
-                    copy of the input data. If an image is progressively encoded,
-                    allowing sharing may degrade the decoding speed.</param>
-        <param name="pfd">The parcel file descriptor containing the data to decode</param>
-        <summary>Create a BitmapRegionDecoder from the file descriptor.</summary>
-        <returns>To be added.</returns>
+                      BitmapRegionDecoder.</param>
+        <param name="isShareable">This field has always been ignored.</param>
+        <summary>Create a BitmapRegionDecoder from an input stream.</summary>
+        <returns>A new BitmapRegionDecoder, or <c>null</c> if <c>is</c> is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(java.io.InputStream,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(java.io.InputStream, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -452,20 +438,13 @@
       </Parameters>
       <Docs>
         <param name="pathName">complete path name for the file to be decoded.</param>
-        <param name="isShareable">If this is true, then the BitmapRegionDecoder may keep a
-                    shallow reference to the input. If this is false,
-                    then the BitmapRegionDecoder will explicitly make a copy of the
-                    input data, and keep that. Even if sharing is allowed,
-                    the implementation may still decide to make a deep
-                    copy of the input data. If an image is progressively encoded,
-                    allowing sharing may degrade the decoding speed.</param>
-        <param name="pfd">The parcel file descriptor containing the data to decode</param>
-        <summary>Create a BitmapRegionDecoder from the file descriptor.</summary>
+        <param name="isShareable">This field has always been ignored.</param>
+        <summary>Create a BitmapRegionDecoder from a file path.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -504,16 +483,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="pfd">The parcel file descriptor containing the data to decode</param>
-        <summary>Create a BitmapRegionDecoder from the file descriptor.</summary>
+        <param name="data">byte array of compressed image data.</param>
+        <param name="offset">offset into data for where the decoder should begin
+                          parsing.</param>
+        <param name="length">the number of bytes, beginning at offset, to parse</param>
+        <summary>Create a BitmapRegionDecoder from the specified byte array.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -556,22 +535,16 @@
       <Docs>
         <param name="data">byte array of compressed image data.</param>
         <param name="offset">offset into data for where the decoder should begin
-               parsing.</param>
+                          parsing.</param>
         <param name="length">the number of bytes, beginning at offset, to parse</param>
-        <param name="isShareable">If this is true, then the BitmapRegionDecoder may keep a
-                    shallow reference to the input. If this is false,
-                    then the BitmapRegionDecoder will explicitly make a copy of the
-                    input data, and keep that. Even if sharing is allowed,
-                    the implementation may still decide to make a deep
-                    copy of the input data. If an image is progressively encoded,
-                    allowing sharing may degrade the decoding speed.</param>
-        <param name="pfd">The parcel file descriptor containing the data to decode</param>
-        <summary>Create a BitmapRegionDecoder from the file descriptor.</summary>
+        <param name="isShareable">This field has been ignored since
+                               <c>Build.VERSION_CODES#GINGERBREAD</c>.</param>
+        <summary>Create a BitmapRegionDecoder from the specified byte array.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder#newInstance(byte[],%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.BitmapRegionDecoder.newInstance(byte[], int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Canvas.xml b/docs/Mono.Android/en/Android.Graphics/Canvas.xml
index 9d67529ac0..b138bdb797 100644
--- a/docs/Mono.Android/en/Android.Graphics/Canvas.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Canvas.xml
@@ -87,12 +87,12 @@
         <Parameter Name="bitmap" Type="Android.Graphics.Bitmap" />
       </Parameters>
       <Docs>
-        <param name="bitmap">To be added.</param>
-        <summary>Construct an empty raster canvas.</summary>
+        <param name="bitmap">Specifies a mutable bitmap for the canvas to draw into.</param>
+        <summary>Construct a canvas with the specified bitmap to draw into.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#Canvas()" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.Canvas()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#Canvas(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.Canvas(android.graphics.Bitmap)</code>.</a>
             </format>
           </para>
           <para>
@@ -254,18 +254,14 @@
         <Parameter Name="rect" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="rect">To be added.</param>
-        <param name="left">The left side of the rectangle used in the difference operation</param>
-        <param name="top">The top of the rectangle used in the difference operation</param>
-        <param name="right">The right side of the rectangle used in the difference operation</param>
-        <param name="bottom">The bottom of the rectangle used in the difference operation</param>
+        <param name="rect">The rectangle to perform a difference op with the current clip.</param>
         <summary>Set the clip to the difference of the current clip and the specified rectangle, which is
             expressed in local coordinates.</summary>
         <returns>true if the resulting clip is non-empty</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipOutRect(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipOutRect(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipOutRect(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipOutRect(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -299,18 +295,14 @@
         <Parameter Name="rect" Type="Android.Graphics.RectF" />
       </Parameters>
       <Docs>
-        <param name="rect">To be added.</param>
-        <param name="left">The left side of the rectangle used in the difference operation</param>
-        <param name="top">The top of the rectangle used in the difference operation</param>
-        <param name="right">The right side of the rectangle used in the difference operation</param>
-        <param name="bottom">The bottom of the rectangle used in the difference operation</param>
+        <param name="rect">The rectangle to perform a difference op with the current clip.</param>
         <summary>Set the clip to the difference of the current clip and the specified rectangle, which is
             expressed in local coordinates.</summary>
         <returns>true if the resulting clip is non-empty</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipOutRect(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipOutRect(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipOutRect(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipOutRect(android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -357,7 +349,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipOutRect(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipOutRect(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipOutRect(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipOutRect(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -484,8 +476,8 @@
         <Parameter Name="op" Type="Android.Graphics.Region+Op" />
       </Parameters>
       <Docs>
-        <param name="op">How the clip is modified</param>
         <param name="path">The path to intersect with the current clip</param>
+        <param name="op">How the clip is modified</param>
         <summary>Intersect the current clip with the specified path.</summary>
         <returns>true if the resulting clip is non-empty</returns>
         <remarks>
@@ -527,20 +519,13 @@
       </Parameters>
       <Docs>
         <param name="rect">The rectangle to intersect with the current clip.</param>
-        <param name="left">The left side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="top">The top of the rectangle to intersect with the current clip</param>
-        <param name="right">The right side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="bottom">The bottom of the rectangle to intersect with the current
-                          clip</param>
         <summary>Intersect the current clip with the specified rectangle, which is
             expressed in local coordinates.</summary>
         <returns>true if the resulting clip is non-empty</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipRect(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipRect(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipRect(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipRect(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -576,20 +561,13 @@
       </Parameters>
       <Docs>
         <param name="rect">The rectangle to intersect with the current clip.</param>
-        <param name="left">The left side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="top">The top of the rectangle to intersect with the current clip</param>
-        <param name="right">The right side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="bottom">The bottom of the rectangle to intersect with the current
-                          clip</param>
         <summary>Intersect the current clip with the specified rectangle, which is
             expressed in local coordinates.</summary>
         <returns>true if the resulting clip is non-empty</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipRect(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipRect(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipRect(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipRect(android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -631,13 +609,6 @@
       <Docs>
         <param name="rect">The rectangle to intersect with the current clip.</param>
         <param name="op">How the clip is modified</param>
-        <param name="left">The left side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="top">The top of the rectangle to intersect with the current clip</param>
-        <param name="right">The right side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="bottom">The bottom of the rectangle to intersect with the current
-                          clip</param>
         <summary>Intersect the current clip with the specified rectangle, which is
             expressed in local coordinates.</summary>
         <returns>true if the resulting clip is non-empty</returns>
@@ -686,13 +657,6 @@
       <Docs>
         <param name="rect">The rect to intersect with the current clip</param>
         <param name="op">How the clip is modified</param>
-        <param name="left">The left side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="top">The top of the rectangle to intersect with the current clip</param>
-        <param name="right">The right side of the rectangle to intersect with the
-                          current clip</param>
-        <param name="bottom">The bottom of the rectangle to intersect with the current
-                          clip</param>
         <summary>Intersect the current clip with the specified rectangle, which is
             expressed in local coordinates.</summary>
         <returns>true if the resulting clip is non-empty</returns>
@@ -750,7 +714,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipRect(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipRect(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#clipRect(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.clipRect(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -844,7 +808,6 @@
         <Parameter Name="op" Type="Android.Graphics.Region+Op" />
       </Parameters>
       <Docs>
-        <param name="op">How the clip is modified</param>
         <param name="left">The left side of the rectangle to intersect with the
                           current clip</param>
         <param name="top">The top of the rectangle to intersect with the current clip</param>
@@ -852,6 +815,7 @@
                           current clip</param>
         <param name="bottom">The bottom of the rectangle to intersect with the current
                           clip</param>
+        <param name="op">How the clip is modified</param>
         <summary>Intersect the current clip with the specified rectangle, which is
             expressed in local coordinates.</summary>
         <returns>true if the resulting clip is non-empty</returns>
@@ -1104,8 +1068,7 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="oval">The bounds of oval used to define the shape and size
-                   of the arc</param>
+        <param name="oval">The bounds of oval used to define the shape and size of the arc</param>
         <param name="startAngle">Starting angle (in degrees) where the arc begins</param>
         <param name="sweepAngle">Sweep angle (in degrees) measured clockwise</param>
         <param name="useCenter">If true, include the center of the oval in the arc, and close it if it is
@@ -1115,7 +1078,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawArc(float,%20float,%20float,%20float,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawArc(android.graphics.RectF,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -1253,17 +1216,14 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
+        <param name="bitmap">The bitmap to draw</param>
         <param name="matrix">The matrix used to transform the bitmap when it is drawn</param>
-        <param name="bitmap">The bitmap to be drawn</param>
-        <param name="left">The position of the left side of the bitmap being drawn</param>
-        <param name="top">The position of the top side of the bitmap being drawn</param>
-        <param name="paint">The paint used to draw the bitmap (may be null)</param>
-        <summary>Draw the specified bitmap, with its top/left corner at (x,y), using the specified paint,
-            transformed by the current matrix.</summary>
+        <param name="paint">May be null. The paint used to draw the bitmap</param>
+        <summary>Draw the bitmap using the specified matrix.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(android.graphics.Bitmap,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(android.graphics.Bitmap,%20android.graphics.Matrix,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -1301,19 +1261,16 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="src">May be null. The subset of the bitmap to be drawn</param>
-        <param name="dst">The rectangle that the bitmap will be scaled/translated
-               to fit into</param>
         <param name="bitmap">The bitmap to be drawn</param>
-        <param name="left">The position of the left side of the bitmap being drawn</param>
-        <param name="top">The position of the top side of the bitmap being drawn</param>
-        <param name="paint">The paint used to draw the bitmap (may be null)</param>
-        <summary>Draw the specified bitmap, with its top/left corner at (x,y), using the specified paint,
-            transformed by the current matrix.</summary>
+        <param name="src">May be null. The subset of the bitmap to be drawn</param>
+        <param name="dst">The rectangle that the bitmap will be scaled/translated to fit into</param>
+        <param name="paint">May be null. The paint used to draw the bitmap</param>
+        <summary>Draw the specified bitmap, scaling/translating automatically to fill the destination
+            rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(android.graphics.Bitmap,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(android.graphics.Bitmap,%20android.graphics.Rect,%20android.graphics.Rect,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -1351,19 +1308,16 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="src">May be null. The subset of the bitmap to be drawn</param>
-        <param name="dst">The rectangle that the bitmap will be scaled/translated
-               to fit into</param>
         <param name="bitmap">The bitmap to be drawn</param>
-        <param name="left">The position of the left side of the bitmap being drawn</param>
-        <param name="top">The position of the top side of the bitmap being drawn</param>
-        <param name="paint">The paint used to draw the bitmap (may be null)</param>
-        <summary>Draw the specified bitmap, with its top/left corner at (x,y), using the specified paint,
-            transformed by the current matrix.</summary>
+        <param name="src">May be null. The subset of the bitmap to be drawn</param>
+        <param name="dst">The rectangle that the bitmap will be scaled/translated to fit into</param>
+        <param name="paint">May be null. The paint used to draw the bitmap</param>
+        <summary>Draw the specified bitmap, scaling/translating automatically to fill the destination
+            rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(android.graphics.Bitmap,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(android.graphics.Bitmap,%20android.graphics.Rect,%20android.graphics.RectF,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -1465,16 +1419,12 @@
         <param name="width">To be added.</param>
         <param name="height">To be added.</param>
         <param name="hasAlpha">To be added.</param>
-        <param name="bitmap">The bitmap to be drawn</param>
-        <param name="left">The position of the left side of the bitmap being drawn</param>
-        <param name="top">The position of the top side of the bitmap being drawn</param>
         <param name="paint">The paint used to draw the bitmap (may be null)</param>
-        <summary>Draw the specified bitmap, with its top/left corner at (x,y), using the specified paint,
-            transformed by the current matrix.</summary>
+        <summary>Legacy version of drawBitmap(int[] colors, .</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(android.graphics.Bitmap,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawBitmap(int[],%20int,%20int,%20int,%20int,%20int,%20int,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -1532,9 +1482,6 @@
         <param name="hasAlpha">True if the alpha channel of the colors contains valid
                  values. If false, the alpha byte is ignored (assumed to
                  be 0xFF for every pixel).</param>
-        <param name="bitmap">The bitmap to be drawn</param>
-        <param name="left">The position of the left side of the bitmap being drawn</param>
-        <param name="top">The position of the top side of the bitmap being drawn</param>
         <param name="paint">The paint used to draw the bitmap (may be null)</param>
         <summary>Draw the specified bitmap, with its top/left corner at (x,y), using the specified paint,
             transformed by the current matrix.</summary>
@@ -1714,13 +1661,14 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">the color to draw onto the canvas</param>
+        <param name="color">the <c>ColorLong</c> to draw onto the canvas. See the <c>Color</c>
+                         class for details about <c>ColorLong</c>s.</param>
         <summary>Fill the entire canvas' bitmap (restricted to the current clip) with the specified color,
             using srcover porterduff mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawColor(int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawColor(long)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawColor(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1755,14 +1703,14 @@
         <Parameter Name="mode" Type="Android.Graphics.BlendMode" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
         <param name="color">the color to draw onto the canvas</param>
-        <summary>Fill the entire canvas' bitmap (restricted to the current clip) with the specified color,
-            using srcover porterduff mode.</summary>
+        <param name="mode">the blendmode to apply to the color</param>
+        <summary>Fill the entire canvas' bitmap (restricted to the current clip) with the specified color and
+            blendmode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawColor(int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawColor(int,%20android.graphics.BlendMode)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawColor(int, android.graphics.BlendMode)</code>.</a>
             </format>
           </para>
           <para>
@@ -1797,9 +1745,9 @@
         <Parameter Name="mode" Type="Android.Graphics.PorterDuff+Mode" />
       </Parameters>
       <Docs>
+        <param name="color">the color to draw onto the canvas</param>
         <param name="mode">the porter-duff mode to apply to the color
 </param>
-        <param name="color">the color to draw onto the canvas</param>
         <summary>Fill the entire canvas' bitmap (restricted to the current clip) with the specified color,
             using srcover porterduff mode.</summary>
         <remarks>
@@ -1841,14 +1789,15 @@
         <Parameter Name="mode" Type="Android.Graphics.BlendMode" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
-        <param name="color">the color to draw onto the canvas</param>
-        <summary>Fill the entire canvas' bitmap (restricted to the current clip) with the specified color,
-            using srcover porterduff mode.</summary>
+        <param name="color">the <c>ColorLong</c> to draw onto the canvas. See the <c>Color</c>
+                         class for details about <c>ColorLong</c>s.</param>
+        <param name="mode">the blendmode to apply to the color</param>
+        <summary>Fill the entire canvas' bitmap (restricted to the current clip) with the specified color and
+            blendmode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawColor(int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawColor(long,%20android.graphics.BlendMode)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawColor(long, android.graphics.BlendMode)</code>.</a>
             </format>
           </para>
           <para>
@@ -1886,20 +1835,20 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="outerRadii">To be added.</param>
-        <param name="innerRadii">To be added.</param>
         <param name="outer">The outer rectangular bounds of the roundRect to be drawn</param>
-        <param name="outerRx">The x-radius of the oval used to round the corners on the outer rectangle</param>
-        <param name="outerRy">The y-radius of the oval used to round the corners on the outer rectangle</param>
+        <param name="outerRadii">Array of 8 float representing the x, y corner radii for top left,
+                              top right, bottom right, bottom left corners respectively on the outer
+                              rounded rectangle</param>
         <param name="inner">The inner rectangular bounds of the roundRect to be drawn</param>
-        <param name="innerRx">The x-radius of the oval used to round the corners on the inner rectangle</param>
-        <param name="innerRy">The y-radius of the oval used to round the corners on the outer rectangle</param>
+        <param name="innerRadii">Array of 8 float representing the x, y corner radii for top left,
+                              top right, bottom right, bottom left corners respectively on the
+                              outer rounded rectangle</param>
         <param name="paint">The paint used to draw the double roundRect</param>
         <summary>Draws a double rounded rectangle using the specified paint.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawDoubleRoundRect(android.graphics.RectF,%20float,%20float,%20android.graphics.RectF,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawDoubleRoundRect(android.graphics.RectF, float, float, android.graphics.RectF, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawDoubleRoundRect(android.graphics.RectF,%20float[],%20android.graphics.RectF,%20float[],%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawDoubleRoundRect(android.graphics.RectF, float[], android.graphics.RectF, float[], android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -2130,10 +2079,6 @@
       </Parameters>
       <Docs>
         <param name="pts">Array of points to draw [x0 y0 x1 y1 x2 y2 ...]</param>
-        <param name="offset">Number of values in the array to skip before drawing.</param>
-        <param name="count">The number of values in the array to process, after skipping "offset" of them.
-                       Since each line uses 4 values, the number of "lines" that are drawn is really
-                       (count &gt;&gt; 2).</param>
         <param name="paint">The paint used to draw the points</param>
         <summary>Draw a series of lines.</summary>
         <remarks>
@@ -2223,14 +2168,13 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="oval">The rectangle bounds of the oval to be drawn
-</param>
         <param name="paint">To be added.</param>
+        <param name="oval">The rectangle bounds of the oval to be drawn</param>
         <summary>Draw the specified oval using the specified paint.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawOval(float,%20float,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawOval(float, float, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawOval(android.graphics.RectF,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawOval(android.graphics.RectF, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -2404,7 +2348,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPatch(android.graphics.NinePatch,%20android.graphics.Rect,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPatch(android.graphics.NinePatch, android.graphics.Rect, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPatch(android.graphics.NinePatch,%20android.graphics.RectF,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPatch(android.graphics.NinePatch, android.graphics.RectF, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -2521,13 +2465,13 @@
         <Parameter Name="dst" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="dst">To be added.</param>
         <param name="picture">The picture to be drawn</param>
-        <summary>Save the canvas state, draw the picture, and restore the canvas state.</summary>
+        <param name="dst">To be added.</param>
+        <summary>Draw the picture, stretched to fit into the dst rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPicture(android.graphics.Picture)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPicture(android.graphics.Picture)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPicture(android.graphics.Picture,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPicture(android.graphics.Picture, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -2563,13 +2507,13 @@
         <Parameter Name="dst" Type="Android.Graphics.RectF" />
       </Parameters>
       <Docs>
-        <param name="dst">To be added.</param>
         <param name="picture">The picture to be drawn</param>
-        <summary>Save the canvas state, draw the picture, and restore the canvas state.</summary>
+        <param name="dst">To be added.</param>
+        <summary>Draw the picture, stretched to fit into the dst rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPicture(android.graphics.Picture)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPicture(android.graphics.Picture)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPicture(android.graphics.Picture,%20android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPicture(android.graphics.Picture, android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -2650,15 +2594,12 @@
       </Parameters>
       <Docs>
         <param name="pts">Array of points to draw [x0 y0 x1 y1 x2 y2 ...]</param>
-        <param name="offset">Number of values to skip before starting to draw.</param>
-        <param name="count">The number of values to process, after skipping offset of them. Since one point
-                       uses two values, the number of "points" that are drawn is really (count &gt;&gt; 1).</param>
         <param name="paint">The paint used to draw the points</param>
-        <summary>Draw a series of points.</summary>
+        <summary>Helper for drawPoints() that assumes you want to draw the entire array</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPoints(float[],%20int,%20int,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPoints(float[], int, int, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPoints(float[],%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPoints(float[], android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -2796,16 +2737,16 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
+        <param name="text">The text to be drawn</param>
         <param name="index">The index of the first character to draw</param>
         <param name="count">The number of characters to draw, starting from index.</param>
-        <param name="text">The text to be drawn</param>
         <param name="pos">Array of [x,y] positions, used to position each character</param>
         <param name="paint">The paint used for the text (e.g. color, size, style)</param>
         <summary>Draw the text in the array, with each character's origin specified by the pos array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPosText(java.lang.String,%20float[],%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPosText(java.lang.String, float[], android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawPosText(char[],%20int,%20int,%20float[],%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawPosText(char[], int, int, float[], android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -2842,16 +2783,12 @@
       </Parameters>
       <Docs>
         <param name="r">The rectangle to be drawn.</param>
-        <param name="left">The left side of the rectangle to be drawn</param>
-        <param name="top">The top side of the rectangle to be drawn</param>
-        <param name="right">The right side of the rectangle to be drawn</param>
-        <param name="bottom">The bottom side of the rectangle to be drawn</param>
-        <param name="paint">The paint used to draw the rect</param>
-        <summary>Draw the specified Rect using the specified paint.</summary>
+        <param name="paint">The paint used to draw the rectangle</param>
+        <summary>Draw the specified Rect using the specified Paint.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawRect(float,%20float,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawRect(float, float, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawRect(android.graphics.Rect,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawRect(android.graphics.Rect, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -2888,16 +2825,12 @@
       </Parameters>
       <Docs>
         <param name="rect">The rect to be drawn</param>
-        <param name="left">The left side of the rectangle to be drawn</param>
-        <param name="top">The top side of the rectangle to be drawn</param>
-        <param name="right">The right side of the rectangle to be drawn</param>
-        <param name="bottom">The bottom side of the rectangle to be drawn</param>
         <param name="paint">The paint used to draw the rect</param>
         <summary>Draw the specified Rect using the specified paint.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawRect(float,%20float,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawRect(float, float, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawRect(android.graphics.RectF,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawRect(android.graphics.RectF, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3075,7 +3008,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawRoundRect(float,%20float,%20float,%20float,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawRoundRect(float, float, float, float, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawRoundRect(android.graphics.RectF,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3165,17 +3098,14 @@
       </Parameters>
       <Docs>
         <param name="text">The text to be drawn</param>
-        <param name="start">The index of the first character in text to draw</param>
-        <param name="end">(end - 1) is the index of the last character in text to draw</param>
-        <param name="x">The x-coordinate of origin for where to draw the text</param>
-        <param name="y">The y-coordinate of origin for where to draw the text</param>
+        <param name="x">The x-coordinate of the origin of the text being drawn</param>
+        <param name="y">The y-coordinate of the baseline of the text being drawn</param>
         <param name="paint">The paint used for the text (e.g. color, size, style)</param>
-        <summary>Draw the specified range of text, specified by start/end, with its origin at (x,y), in the
-            specified Paint.</summary>
+        <summary>Draw the text, with origin at (x,y), using the specified paint.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawText(java.lang.CharSequence,%20int,%20int,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawText(java.lang.String,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawText(java.lang.String, float, float, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3269,17 +3199,14 @@
         <param name="index">To be added.</param>
         <param name="count">To be added.</param>
         <param name="text">The text to be drawn</param>
-        <param name="start">The index of the first character in text to draw</param>
-        <param name="end">(end - 1) is the index of the last character in text to draw</param>
-        <param name="x">The x-coordinate of origin for where to draw the text</param>
-        <param name="y">The y-coordinate of origin for where to draw the text</param>
+        <param name="x">The x-coordinate of the origin of the text being drawn</param>
+        <param name="y">The y-coordinate of the baseline of the text being drawn</param>
         <param name="paint">The paint used for the text (e.g. color, size, style)</param>
-        <summary>Draw the specified range of text, specified by start/end, with its origin at (x,y), in the
-            specified Paint.</summary>
+        <summary>Draw the text, with origin at (x,y), using the specified paint.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawText(java.lang.CharSequence,%20int,%20int,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawText(char[],%20int,%20int,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawText(char[], int, int, float, float, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3322,15 +3249,14 @@
         <param name="text">The text to be drawn</param>
         <param name="start">The index of the first character in text to draw</param>
         <param name="end">(end - 1) is the index of the last character in text to draw</param>
-        <param name="x">The x-coordinate of origin for where to draw the text</param>
-        <param name="y">The y-coordinate of origin for where to draw the text</param>
+        <param name="x">The x-coordinate of the origin of the text being drawn</param>
+        <param name="y">The y-coordinate of the baseline of the text being drawn</param>
         <param name="paint">The paint used for the text (e.g. color, size, style)</param>
-        <summary>Draw the specified range of text, specified by start/end, with its origin at (x,y), in the
-            specified Paint.</summary>
+        <summary>Draw the text, with origin at (x,y), using the specified paint.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawText(java.lang.CharSequence,%20int,%20int,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawText(java.lang.String,%20int,%20int,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawText(java.lang.String, int, int, float, float, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3419,9 +3345,9 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <param name="count">To be added.</param>
         <param name="text">The text to be drawn</param>
+        <param name="index">The starting index within the text to be drawn</param>
+        <param name="count">Starting from index, the number of characters to draw</param>
         <param name="path">The path the text should follow for its baseline</param>
         <param name="hOffset">The distance along the path to add to the text's starting position</param>
         <param name="vOffset">The distance above(-) or below(+) the path to position the text</param>
@@ -3430,7 +3356,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextOnPath(java.lang.String,%20android.graphics.Path,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextOnPath(char[],%20int,%20int,%20android.graphics.Path,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3547,7 +3473,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextRun(android.graphics.text.MeasuredText,%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextRun(android.graphics.text.MeasuredText, int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextRun(java.lang.CharSequence,%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextRun(java.lang.CharSequence, int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3589,17 +3515,12 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <param name="count">To be added.</param>
-        <param name="contextIndex">To be added.</param>
-        <param name="contextCount">To be added.</param>
         <param name="text">the text to render</param>
-        <param name="start">the start of the text to render. Data before this position can be used for
-                       shaping context.</param>
-        <param name="end">the end of the text to render. Data at or after this position can be used for
-                       shaping context.</param>
-        <param name="contextStart">the index of the start of the shaping context</param>
-        <param name="contextEnd">the index of the end of the shaping context</param>
+        <param name="index">the start of the text to render</param>
+        <param name="count">the count of chars to render</param>
+        <param name="contextIndex">the start of the context for shaping. Must be no greater than index.</param>
+        <param name="contextCount">the number of characters in the context for shaping. contexIndex +
+                       contextCount must be no less than index + count.</param>
         <param name="x">the x position at which to draw the text</param>
         <param name="y">the y position at which to draw the text</param>
         <param name="isRtl">whether the run is in RTL direction</param>
@@ -3609,7 +3530,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextRun(android.graphics.text.MeasuredText,%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextRun(android.graphics.text.MeasuredText, int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextRun(char[],%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3661,7 +3582,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextRun(android.graphics.text.MeasuredText,%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextRun(android.graphics.text.MeasuredText, int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#drawTextRun(java.lang.CharSequence,%20int,%20int,%20int,%20int,%20float,%20float,%20boolean,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.drawTextRun(java.lang.CharSequence, int, int, int, int, float, float, boolean, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -3706,7 +3627,6 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="indexOffset">To be added.</param>
         <param name="mode">How to interpret the array of vertices</param>
         <param name="vertexCount">The number of values in the vertices array (and corresponding texs and
                        colors arrays if non-null). Each logical vertex is two values (x, y), vertexCount
@@ -3721,6 +3641,7 @@
         <param name="colorOffset">Number of values in colors to skip before drawing.</param>
         <param name="indices">If not null, array of indices to reference into the vertex (texs, colors)
                        array.</param>
+        <param name="indexOffset">To be added.</param>
         <param name="indexCount">number of entries in the indices array (if not null).</param>
         <param name="paint">Specifies the shader to use if the texs array is non-null.</param>
         <summary>Draw the array of vertices, interpreted as triangles (based on mode).</summary>
@@ -3815,13 +3736,14 @@
       </Parameters>
       <Docs>
         <param name="bounds">Return the clip bounds here. If it is null, ignore it but
-               still return true if the current clip is non-empty.</param>
-        <summary>Retrieve the bounds of the current clip (in local coordinates).</summary>
-        <returns>the clip bounds, or [0, 0, 0, 0] if the clip is empty.</returns>
+                          still return true if the current clip is non-empty.</param>
+        <summary>Return the bounds of the current clip (in local coordinates) in the
+            bounds parameter, and return true if it is non-empty.</summary>
+        <returns>true if the current clip is non-empty.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#getClipBounds()" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.getClipBounds()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#getClipBounds(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.getClipBounds(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -3861,12 +3783,11 @@
       </Parameters>
       <Docs>
         <param name="ctm">To be added.</param>
-        <summary>Return a new matrix with a copy of the canvas' current transformation
-            matrix.</summary>
+        <summary>Return, in ctm, the current transformation matrix.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#getMatrix()" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.getMatrix()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#getMatrix(android.graphics.Matrix)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.getMatrix(android.graphics.Matrix)</code>.</a>
             </format>
           </para>
           <para>
@@ -4200,23 +4121,15 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="left">The left side of the rectangle to compare with the
-                               current clip</param>
-        <param name="top">The top of the rectangle to compare with the current
-                               clip</param>
-        <param name="right">The right side of the rectangle to compare with the
-                               current clip</param>
-        <param name="bottom">The bottom of the rectangle to compare with the
-                               current clip</param>
-        <summary>Return true if the specified rectangle, after being transformed by the
+        <param name="path">The path to compare with the current clip</param>
+        <summary>Return true if the specified path, after being transformed by the
             current matrix, would lie completely outside of the current clip.</summary>
-        <returns>true if the rect (transformed by the canvas' matrix)
+        <returns>true if the path (transformed by the canvas' matrix)
                                does not intersect with the canvas' clip</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#quickReject(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.quickReject(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#quickReject(android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.quickReject(android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -4250,23 +4163,15 @@
         <Parameter Name="rect" Type="Android.Graphics.RectF" />
       </Parameters>
       <Docs>
-        <param name="rect">To be added.</param>
-        <param name="left">The left side of the rectangle to compare with the
-                               current clip</param>
-        <param name="top">The top of the rectangle to compare with the current
-                               clip</param>
-        <param name="right">The right side of the rectangle to compare with the
-                               current clip</param>
-        <param name="bottom">The bottom of the rectangle to compare with the
-                               current clip</param>
+        <param name="rect">the rect to compare with the current clip</param>
         <summary>Return true if the specified rectangle, after being transformed by the
             current matrix, would lie completely outside of the current clip.</summary>
         <returns>true if the rect (transformed by the canvas' matrix)
-                               does not intersect with the canvas' clip</returns>
+                         does not intersect with the canvas' clip</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#quickReject(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.quickReject(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#quickReject(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.quickReject(android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -4312,14 +4217,6 @@
           </format> if the path should be considered antialiased,
                     since that means it may affect a larger area (more pixels) than
                     non-antialiased (<format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=Canvas EdgeType BW;scope=Xamarin" title="Canvas EdgeType BW">Canvas EdgeType BW</a></format>).</param>
-        <param name="left">The left side of the rectangle to compare with the
-                               current clip</param>
-        <param name="top">The top of the rectangle to compare with the current
-                               clip</param>
-        <param name="right">The right side of the rectangle to compare with the
-                               current clip</param>
-        <param name="bottom">The bottom of the rectangle to compare with the
-                               current clip</param>
         <summary>Return true if the specified rectangle, after being transformed by the
             current matrix, would lie completely outside of the current clip.</summary>
         <returns>true if the rect (transformed by the canvas' matrix)
@@ -4374,14 +4271,6 @@
           </format> if the path should be considered antialiased,
               since that means it may affect a larger area (more pixels) than
               non-antialiased (<format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=Canvas EdgeType BW;scope=Xamarin" title="Canvas EdgeType BW">Canvas EdgeType BW</a></format>).</param>
-        <param name="left">The left side of the rectangle to compare with the
-                               current clip</param>
-        <param name="top">The top of the rectangle to compare with the current
-                               clip</param>
-        <param name="right">The right side of the rectangle to compare with the
-                               current clip</param>
-        <param name="bottom">The bottom of the rectangle to compare with the
-                               current clip</param>
         <summary>Return true if the specified rectangle, after being transformed by the
             current matrix, would lie completely outside of the current clip.</summary>
         <returns>true if the rect (transformed by the canvas' matrix)
@@ -4484,12 +4373,6 @@
         <Parameter Name="type" Type="Android.Graphics.Canvas+EdgeType" />
       </Parameters>
       <Docs>
-        <param name="type">
-          <format type="text/html">
-            <a href="https://docs.microsoft.com/en-us/search/index?search=Canvas EdgeType AA;scope=Xamarin" title="Canvas EdgeType AA">Canvas EdgeType AA</a>
-          </format> if the path should be considered antialiased,
-                    since that means it may affect a larger area (more pixels) than
-                    non-antialiased (<format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=Canvas EdgeType BW;scope=Xamarin" title="Canvas EdgeType BW">Canvas EdgeType BW</a></format>).</param>
         <param name="left">The left side of the rectangle to compare with the
                                current clip</param>
         <param name="top">The top of the rectangle to compare with the current
@@ -4498,6 +4381,12 @@
                                current clip</param>
         <param name="bottom">The bottom of the rectangle to compare with the
                                current clip</param>
+        <param name="type">
+          <format type="text/html">
+            <a href="https://docs.microsoft.com/en-us/search/index?search=Canvas EdgeType AA;scope=Xamarin" title="Canvas EdgeType AA">Canvas EdgeType AA</a>
+          </format> if the path should be considered antialiased,
+                    since that means it may affect a larger area (more pixels) than
+                    non-antialiased (<format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=Canvas EdgeType BW;scope=Xamarin" title="Canvas EdgeType BW">Canvas EdgeType BW</a></format>).</param>
         <summary>Return true if the specified rectangle, after being transformed by the
             current matrix, would lie completely outside of the current clip.</summary>
         <returns>true if the rect (transformed by the canvas' matrix)
@@ -4661,15 +4550,14 @@
         <Parameter Name="py" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="px">The x-coord for the pivot point (unchanged by the rotation)</param>
-        <param name="py">The y-coord for the pivot point (unchanged by the rotation)
-</param>
         <param name="degrees">The amount to rotate, in degrees</param>
+        <param name="px">The x-coord for the pivot point (unchanged by the rotation)</param>
+        <param name="py">The y-coord for the pivot point (unchanged by the rotation)</param>
         <summary>Preconcat the current matrix with the specified rotation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#rotate(float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.rotate(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#rotate(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.rotate(float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -4833,15 +4721,17 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="bounds">To be added.</param>
-        <param name="paint">To be added.</param>
-        <summary>Convenience for <c>#saveLayer(RectF, Paint)</c> that takes the four float coordinates of the
-            bounds rectangle.</summary>
-        <returns>To be added.</returns>
+        <param name="bounds">May be null. The maximum size the offscreen render target
+                          needs to be (in local coordinates)</param>
+        <param name="paint">This is copied, and is applied to the offscreen when
+                          restore() is called.</param>
+        <summary>This behaves the same as save(), but in addition it allocates and
+            redirects drawing to an offscreen rendering target.</summary>
+        <returns>value to pass to restoreToCount() to balance this save()</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayer(float,%20float,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayer(float, float, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayer(android.graphics.RectF,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayer(android.graphics.RectF, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -4889,18 +4779,18 @@
       </Parameters>
       <Docs>
         <param name="bounds">May be null. The maximum size the offscreen bitmap
-               needs to be (in local coordinates)</param>
+                          needs to be (in local coordinates)</param>
         <param name="paint">This is copied, and is applied to the offscreen when
-               restore() is called.</param>
-        <param name="saveFlags">see _SAVE_FLAG constants, generally <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Graphics Canvas ALL_SAVE_FLAG';scope=Xamarin" title="Android.Graphics.Canvas.ALL_SAVE_FLAG">Android.Graphics.Canvas.ALL_SAVE_FLAG</a></format> is recommended
-               for performance reasons.</param>
-        <summary>Convenience for <c>#saveLayer(RectF, Paint)</c> that takes the four float coordinates of the
-            bounds rectangle.</summary>
-        <returns>To be added.</returns>
+                          restore() is called.</param>
+        <param name="saveFlags">see _SAVE_FLAG constants, generally <c>#ALL_SAVE_FLAG</c> is recommended
+                          for performance reasons.</param>
+        <summary>This behaves the same as save(), but in addition it allocates and
+            redirects drawing to an offscreen bitmap.</summary>
+        <returns>value to pass to restoreToCount() to balance this save()</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayer(float,%20float,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayer(float, float, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayer(android.graphics.RectF,%20android.graphics.Paint,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayer(android.graphics.RectF, android.graphics.Paint, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5006,13 +4896,12 @@
         <param name="bottom">To be added.</param>
         <param name="paint">To be added.</param>
         <param name="saveFlags">To be added.</param>
-        <summary>Convenience for <c>#saveLayer(RectF, Paint)</c> that takes the four float coordinates of the
-            bounds rectangle.</summary>
+        <summary>Helper version of saveLayer() that takes 4 values rather than a RectF.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayer(float,%20float,%20float,%20float,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayer(float, float, float, float, android.graphics.Paint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayer(float,%20float,%20float,%20float,%20android.graphics.Paint,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayer(float, float, float, float, android.graphics.Paint, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5048,15 +4937,17 @@
         <Parameter Name="alpha" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="bounds">To be added.</param>
-        <param name="alpha">To be added.</param>
-        <summary>Convenience for <c>#saveLayerAlpha(RectF, int)</c> that takes the four float coordinates of
-            the bounds rectangle.</summary>
+        <param name="bounds">The maximum size the offscreen bitmap needs to be
+                             (in local coordinates)</param>
+        <param name="alpha">The alpha to apply to the offscreen when it is
+                                    drawn during restore()</param>
+        <summary>Convenience for <c>#saveLayer(RectF, Paint)</c> but instead of taking a entire Paint object
+            it takes only the <c>alpha</c> parameter.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayerAlpha(float,%20float,%20float,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayerAlpha(float, float, float, float, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayerAlpha(android.graphics.RectF,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayerAlpha(android.graphics.RectF, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5104,18 +4995,18 @@
       </Parameters>
       <Docs>
         <param name="bounds">The maximum size the offscreen bitmap needs to be
-                  (in local coordinates)</param>
-        <param name="alpha">The alpha to apply to the offscreen when when it is
-                        drawn during restore()</param>
-        <param name="saveFlags">see _SAVE_FLAG constants, generally <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Graphics Canvas ALL_SAVE_FLAG';scope=Xamarin" title="Android.Graphics.Canvas.ALL_SAVE_FLAG">Android.Graphics.Canvas.ALL_SAVE_FLAG</a></format> is recommended
-                  for performance reasons.</param>
-        <summary>Convenience for <c>#saveLayerAlpha(RectF, int)</c> that takes the four float coordinates of
-            the bounds rectangle.</summary>
-        <returns>To be added.</returns>
+                             (in local coordinates)</param>
+        <param name="alpha">The alpha to apply to the offscreen when it is
+                                    drawn during restore()</param>
+        <param name="saveFlags">see _SAVE_FLAG constants, generally <c>#ALL_SAVE_FLAG</c> is recommended
+                             for performance reasons.</param>
+        <summary>This behaves the same as save(), but in addition it allocates and
+            redirects drawing to an offscreen bitmap.</summary>
+        <returns>value to pass to restoreToCount() to balance this call</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayerAlpha(float,%20float,%20float,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayerAlpha(float, float, float, float, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayerAlpha(android.graphics.RectF,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayerAlpha(android.graphics.RectF, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5221,13 +5112,12 @@
         <param name="bottom">To be added.</param>
         <param name="alpha">To be added.</param>
         <param name="saveFlags">To be added.</param>
-        <summary>Convenience for <c>#saveLayerAlpha(RectF, int)</c> that takes the four float coordinates of
-            the bounds rectangle.</summary>
+        <summary>Helper for saveLayerAlpha() that takes 4 values instead of a RectF.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayerAlpha(float,%20float,%20float,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayerAlpha(float, float, float, float, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#saveLayerAlpha(float,%20float,%20float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.saveLayerAlpha(float, float, float, float, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5307,16 +5197,15 @@
         <Parameter Name="py" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="px">The x-coord for the pivot point (unchanged by the scale)</param>
-        <param name="py">The y-coord for the pivot point (unchanged by the scale)
-</param>
         <param name="sx">The amount to scale in X</param>
         <param name="sy">The amount to scale in Y</param>
+        <param name="px">The x-coord for the pivot point (unchanged by the scale)</param>
+        <param name="py">The y-coord for the pivot point (unchanged by the scale)</param>
         <summary>Preconcat the current matrix with the specified scale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Canvas#scale(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.scale(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Canvas#scale(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Canvas.scale(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/ColorMatrix.xml b/docs/Mono.Android/en/Android.Graphics/ColorMatrix.xml
index 45dffbb7ee..6e9dbdc0d8 100644
--- a/docs/Mono.Android/en/Android.Graphics/ColorMatrix.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ColorMatrix.xml
@@ -89,12 +89,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Create a new colormatrix initialized to identity (as if reset() had
-            been called).</summary>
+        <summary>Create a new colormatrix initialized with the specified colormatrix.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/ColorMatrix#ColorMatrix()" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrix.ColorMatrix()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/ColorMatrix#ColorMatrix(android.graphics.ColorMatrix)" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrix.ColorMatrix(android.graphics.ColorMatrix)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,12 +126,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Create a new colormatrix initialized to identity (as if reset() had
-            been called).</summary>
+        <summary>Create a new colormatrix initialized with the specified array of values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/ColorMatrix#ColorMatrix()" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrix.ColorMatrix()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/ColorMatrix#ColorMatrix(float[])" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrix.ColorMatrix(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -417,11 +415,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Assign the src colormatrix into this matrix, copying all of its values.</summary>
+        <summary>Assign the array of floats into this matrix, copying all of its values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/ColorMatrix#set(android.graphics.ColorMatrix)" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrix.set(android.graphics.ColorMatrix)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/ColorMatrix#set(float[])" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrix.set(float[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/ColorMatrixColorFilter.xml b/docs/Mono.Android/en/Android.Graphics/ColorMatrixColorFilter.xml
index f8b5d15cb3..0d3b6c9463 100644
--- a/docs/Mono.Android/en/Android.Graphics/ColorMatrixColorFilter.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ColorMatrixColorFilter.xml
@@ -92,15 +92,14 @@
         <Parameter Name="array" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
-        <param name="matrix">4x5 matrix used to transform colors. It is copied into
-                          the filter, so changes made to the matrix after the filter
-                          is constructed will not be reflected in the filter.</param>
+        <param name="array">Array of floats used to transform colors, treated as a 4x5
+                         matrix. The first 20 entries of the array are copied into
+                         the filter. See ColorMatrix.</param>
         <summary>Create a color filter that transforms colors through a 4x5 color matrix.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/ColorMatrixColorFilter#ColorMatrixColorFilter(android.graphics.ColorMatrix)" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrixColorFilter.ColorMatrixColorFilter(android.graphics.ColorMatrix)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/ColorMatrixColorFilter#ColorMatrixColorFilter(float[])" title="Reference documentation">Java documentation for <code>android.graphics.ColorMatrixColorFilter.ColorMatrixColorFilter(float[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/ColorObject.xml b/docs/Mono.Android/en/Android.Graphics/ColorObject.xml
index 4f3bdf58ee..c6697330dc 100644
--- a/docs/Mono.Android/en/Android.Graphics/ColorObject.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ColorObject.xml
@@ -146,12 +146,12 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <summary>Returns the value of the alpha component in the range \([0.</summary>
+        <summary>Return the alpha component of a color int.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#alpha()" title="Reference documentation">Java documentation for <code>android.graphics.Color.alpha()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#alpha(int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.alpha(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +185,13 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Returns the value of the alpha component in the range \([0.</summary>
-        <returns>To be added.</returns>
+        <param name="color">The color long whose blue channel to extract</param>
+        <summary>Returns the alpha component encoded in the specified color long.</summary>
+        <returns>A float value in the range \([0..1]\)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#alpha()" title="Reference documentation">Java documentation for <code>android.graphics.Color.alpha()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#alpha(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.alpha(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -228,17 +228,16 @@
         <Parameter Name="blue" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="alpha">Alpha component \([0..1]\) of the color</param>
-        <param name="red">Red component \([0..1]\) of the color</param>
-        <param name="green">Green component \([0..1]\) of the color</param>
-        <param name="blue">Blue component \([0..1]\) of the color</param>
-        <summary>Return a color-int from alpha, red, green, blue float components
-            in the range \([0.</summary>
+        <param name="alpha">Alpha component \([0..255]\) of the color</param>
+        <param name="red">Red component \([0..255]\) of the color</param>
+        <param name="green">Green component \([0..255]\) of the color</param>
+        <param name="blue">Blue component \([0..255]\) of the color</param>
+        <summary>Return a color-int from alpha, red, green, blue components.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#argb(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.argb(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#argb(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.argb(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -386,14 +385,12 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <summary>Returns the value of the blue component in the range defined by this
-            color's color space (see <c>ColorSpace#getMinValue(int)</c> and
-            <c>ColorSpace#getMaxValue(int)</c>).</summary>
+        <summary>Return the blue component of a color int.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#blue()" title="Reference documentation">Java documentation for <code>android.graphics.Color.blue()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#blue(int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.blue(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -427,15 +424,14 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Returns the value of the blue component in the range defined by this
-            color's color space (see <c>ColorSpace#getMinValue(int)</c> and
-            <c>ColorSpace#getMaxValue(int)</c>).</summary>
-        <returns>To be added.</returns>
+        <param name="color">The color long whose blue channel to extract</param>
+        <summary>Returns the blue component encoded in the specified color long.</summary>
+        <returns>A float value with a range defined by the specified color's
+            color space</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#blue()" title="Reference documentation">Java documentation for <code>android.graphics.Color.blue()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#blue(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.blue(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -584,20 +580,13 @@
         <Parameter Name="colorSpace" Type="Android.Graphics.ColorSpace" />
       </Parameters>
       <Docs>
-        <param name="colorSpace">To be added.</param>
-        <param name="r">The red component of the color to convert</param>
-        <param name="g">The green component of the color to convert</param>
-        <param name="b">The blue component of the color to convert</param>
-        <param name="a">The alpha component of the color to convert, in \([0..1]\)</param>
-        <param name="source">The source color space, cannot be null</param>
-        <param name="destination">The destination color space, cannot be null</param>
-        <summary>Converts the specified 3 component color from the source color space to the
-            destination color space.</summary>
-        <returns>A color long in the destination color space</returns>
+        <param name="colorSpace">The destination color space, cannot be null</param>
+        <summary>Converts this color from its color space to the specified color space.</summary>
+        <returns>A non-null color instance in the specified color space</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#convert(float,%20float,%20float,%20float,%20android.graphics.ColorSpace,%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.convert(float, float, float, float, android.graphics.ColorSpace, android.graphics.ColorSpace)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#convert(android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.convert(android.graphics.ColorSpace)</code>.</a>
             </format>
           </para>
           <para>
@@ -632,21 +621,15 @@
         <Parameter Name="colorSpace" Type="Android.Graphics.ColorSpace" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <param name="colorSpace">To be added.</param>
-        <param name="r">The red component of the color to convert</param>
-        <param name="g">The green component of the color to convert</param>
-        <param name="b">The blue component of the color to convert</param>
-        <param name="a">The alpha component of the color to convert, in \([0..1]\)</param>
-        <param name="source">The source color space, cannot be null</param>
-        <param name="destination">The destination color space, cannot be null</param>
-        <summary>Converts the specified 3 component color from the source color space to the
-            destination color space.</summary>
+        <param name="color">The sRGB color int to convert</param>
+        <param name="colorSpace">The destination color space</param>
+        <summary>Converts the specified ARGB color int from the <c>ColorSpace.Named#SRGB sRGB</c>
+            color space into the specified destination color space.</summary>
         <returns>A color long in the destination color space</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#convert(float,%20float,%20float,%20float,%20android.graphics.ColorSpace,%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.convert(float, float, float, float, android.graphics.ColorSpace, android.graphics.ColorSpace)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#convert(int,%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.convert(int, android.graphics.ColorSpace)</code>.</a>
             </format>
           </para>
           <para>
@@ -681,21 +664,15 @@
         <Parameter Name="colorSpace" Type="Android.Graphics.ColorSpace" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <param name="colorSpace">To be added.</param>
-        <param name="r">The red component of the color to convert</param>
-        <param name="g">The green component of the color to convert</param>
-        <param name="b">The blue component of the color to convert</param>
-        <param name="a">The alpha component of the color to convert, in \([0..1]\)</param>
-        <param name="source">The source color space, cannot be null</param>
-        <param name="destination">The destination color space, cannot be null</param>
-        <summary>Converts the specified 3 component color from the source color space to the
+        <param name="color">The color long to convert</param>
+        <param name="colorSpace">The destination color space</param>
+        <summary>Converts the specified color long from its color space into the specified
             destination color space.</summary>
         <returns>A color long in the destination color space</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#convert(float,%20float,%20float,%20float,%20android.graphics.ColorSpace,%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.convert(float, float, float, float, android.graphics.ColorSpace, android.graphics.ColorSpace)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#convert(long,%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.convert(long, android.graphics.ColorSpace)</code>.</a>
             </format>
           </para>
           <para>
@@ -732,12 +709,6 @@
       <Docs>
         <param name="color">To be added.</param>
         <param name="connector">To be added.</param>
-        <param name="r">The red component of the color to convert</param>
-        <param name="g">The green component of the color to convert</param>
-        <param name="b">The blue component of the color to convert</param>
-        <param name="a">The alpha component of the color to convert, in \([0..1]\)</param>
-        <param name="source">The source color space, cannot be null</param>
-        <param name="destination">The destination color space, cannot be null</param>
         <summary>Converts the specified 3 component color from the source color space to the
             destination color space.</summary>
         <returns>A color long in the destination color space</returns>
@@ -782,13 +753,11 @@
         <Parameter Name="connector" Type="Android.Graphics.ColorSpace+Connector" />
       </Parameters>
       <Docs>
-        <param name="connector">To be added.</param>
         <param name="r">The red component of the color to convert</param>
         <param name="g">The green component of the color to convert</param>
         <param name="b">The blue component of the color to convert</param>
         <param name="a">The alpha component of the color to convert, in \([0..1]\)</param>
-        <param name="source">The source color space, cannot be null</param>
-        <param name="destination">The destination color space, cannot be null</param>
+        <param name="connector">To be added.</param>
         <summary>Converts the specified 3 component color from the source color space to the
             destination color space.</summary>
         <returns>A color long in the destination color space</returns>
@@ -1013,13 +982,15 @@
         <Parameter Name="components" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="components">To be added.</param>
-        <summary>Returns this color's components as a new array.</summary>
-        <returns>A new, non-null array whose size is equal to <c>#getComponentCount()</c></returns>
+        <param name="components">An array of floats whose size must be at least
+                             <c>#getComponentCount()</c>, can be null</param>
+        <summary>Copies this color's components in the supplied array.</summary>
+        <returns>The array passed as a parameter if not null, or a new array of length
+                    <c>#getComponentCount()</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#getComponents()" title="Reference documentation">Java documentation for <code>android.graphics.Color.getComponents()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#getComponents(float[])" title="Reference documentation">Java documentation for <code>android.graphics.Color.getComponents(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1120,14 +1091,12 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <summary>Returns the value of the green component in the range defined by this
-            color's color space (see <c>ColorSpace#getMinValue(int)</c> and
-            <c>ColorSpace#getMaxValue(int)</c>).</summary>
+        <summary>Return the green component of a color int.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#green()" title="Reference documentation">Java documentation for <code>android.graphics.Color.green()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#green(int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.green(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1161,15 +1130,14 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Returns the value of the green component in the range defined by this
-            color's color space (see <c>ColorSpace#getMinValue(int)</c> and
-            <c>ColorSpace#getMaxValue(int)</c>).</summary>
-        <returns>To be added.</returns>
+        <param name="color">The color long whose green channel to extract</param>
+        <summary>Returns the green component encoded in the specified color long.</summary>
+        <returns>A float value with a range defined by the specified color's
+            color space</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#green()" title="Reference documentation">Java documentation for <code>android.graphics.Color.green()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#green(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.green(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1203,14 +1171,13 @@
         <Parameter Name="hsv" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="alpha">the alpha component of the returned argb color.</param>
         <param name="hsv">3 element array which holds the input HSV components.</param>
         <summary>Convert HSV components to an ARGB color.</summary>
         <returns>the resulting argb color</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#HSVToColor(int,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Color.HSVToColor(int, float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#HSVToColor(float[])" title="Reference documentation">Java documentation for <code>android.graphics.Color.HSVToColor(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1326,14 +1293,14 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Indicates whether this color is in the <c>ColorSpace.Named#SRGB sRGB</c>
-            color space.</summary>
-        <returns>True if this color is in the sRGB color space, false otherwise</returns>
+        <param name="color">The color to test</param>
+        <summary>Indicates whether the specified color is in the
+            <c>ColorSpace.Named#SRGB sRGB</c> color space.</summary>
+        <returns>True if the color is in the sRGB color space, false otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#isSrgb()" title="Reference documentation">Java documentation for <code>android.graphics.Color.isSrgb()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#isSrgb(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.isSrgb(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1367,13 +1334,13 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Indicates whether this color color is in a wide-gamut color space.</summary>
-        <returns>True if this color is in a wide-gamut color space, false otherwise</returns>
+        <param name="color">The color to test</param>
+        <summary>Indicates whether the specified color is in a wide-gamut color space.</summary>
+        <returns>True if the color is in a wide-gamut color space, false otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#isWideGamut()" title="Reference documentation">Java documentation for <code>android.graphics.Color.isWideGamut()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#isWideGamut(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.isWideGamut(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1618,12 +1585,12 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <summary>Returns the relative luminance of this color.</summary>
-        <returns>A value between 0 (darkest black) and 1 (lightest white)</returns>
+        <summary>Returns the relative luminance of a color.</summary>
+        <returns>a value between 0 (darkest black) and 1 (lightest white)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#luminance()" title="Reference documentation">Java documentation for <code>android.graphics.Color.luminance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#luminance(int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.luminance(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1658,12 +1625,12 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <summary>Returns the relative luminance of this color.</summary>
+        <summary>Returns the relative luminance of a color.</summary>
         <returns>A value between 0 (darkest black) and 1 (lightest white)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#luminance()" title="Reference documentation">Java documentation for <code>android.graphics.Color.luminance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#luminance(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.luminance(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1797,13 +1764,14 @@
         <Parameter Name="color" Type="Android.Graphics.Color" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Packs this color into a color long.</summary>
+        <param name="color">The ARGB color int to convert to an RGBA color long in sRGB</param>
+        <summary>Converts the specified ARGB color int to an RGBA color long in the sRGB
+            color space.</summary>
         <returns>A color long</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#pack()" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#pack(int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1839,15 +1807,16 @@
         <Parameter Name="blue" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="red">To be added.</param>
-        <param name="green">To be added.</param>
-        <param name="blue">To be added.</param>
-        <summary>Packs this color into a color long.</summary>
+        <param name="red">The red component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="green">The green component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="blue">The blue component of the sRGB color to create, in \([0..1]\)</param>
+        <summary>Packs the sRGB color defined by the specified red, green and blue component
+            values into an RGBA color long in the sRGB color space.</summary>
         <returns>A color long</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#pack()" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#pack(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack(float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1884,16 +1853,17 @@
         <Parameter Name="alpha" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="red">To be added.</param>
-        <param name="green">To be added.</param>
-        <param name="blue">To be added.</param>
-        <param name="alpha">To be added.</param>
-        <summary>Packs this color into a color long.</summary>
+        <param name="red">The red component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="green">The green component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="blue">The blue component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="alpha">The alpha component of the sRGB color to create, in \([0..1]\)</param>
+        <summary>Packs the sRGB color defined by the specified red, green, blue and alpha
+            component values into an RGBA color long in the sRGB color space.</summary>
         <returns>A color long</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#pack()" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#pack(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1931,17 +1901,18 @@
         <Parameter Name="colorSpace" Type="Android.Graphics.ColorSpace" />
       </Parameters>
       <Docs>
-        <param name="red">To be added.</param>
-        <param name="green">To be added.</param>
-        <param name="blue">To be added.</param>
-        <param name="alpha">To be added.</param>
         <param name="colorSpace">To be added.</param>
-        <summary>Packs this color into a color long.</summary>
+        <param name="red">The red component of the color to create</param>
+        <param name="green">The green component of the color to create</param>
+        <param name="blue">The blue component of the color to create</param>
+        <param name="alpha">The alpha component of the color to create, in \([0..1]\)</param>
+        <summary>Packs the 3 component color defined by the specified red, green, blue and
+            alpha component values into a color long in the specified color space.</summary>
         <returns>A color long</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#pack()" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#pack(float,%20float,%20float,%20float,%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.pack(float, float, float, float, android.graphics.ColorSpace)</code>.</a>
             </format>
           </para>
           <para>
@@ -2055,14 +2026,12 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <summary>Returns the value of the red component in the range defined by this
-            color's color space (see <c>ColorSpace#getMinValue(int)</c> and
-            <c>ColorSpace#getMaxValue(int)</c>).</summary>
+        <summary>Return the red component of a color int.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#red()" title="Reference documentation">Java documentation for <code>android.graphics.Color.red()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#red(int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.red(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2096,15 +2065,14 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Returns the value of the red component in the range defined by this
-            color's color space (see <c>ColorSpace#getMinValue(int)</c> and
-            <c>ColorSpace#getMaxValue(int)</c>).</summary>
-        <returns>To be added.</returns>
+        <param name="color">The color long whose red channel to extract</param>
+        <summary>Returns the red component encoded in the specified color long.</summary>
+        <returns>A float value with a range defined by the specified color's
+            color space</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#red()" title="Reference documentation">Java documentation for <code>android.graphics.Color.red()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#red(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.red(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2140,16 +2108,15 @@
         <Parameter Name="blue" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="red">Red component \([0..1]\) of the color</param>
-        <param name="green">Green component \([0..1]\) of the color</param>
-        <param name="blue">Blue component \([0..1]\) of the color</param>
-        <summary>Return a color-int from red, green, blue float components
-            in the range \([0.</summary>
+        <param name="red">Red component \([0..255]\) of the color</param>
+        <param name="green">Green component \([0..255]\) of the color</param>
+        <param name="blue">Blue component \([0..255]\) of the color</param>
+        <summary>Return a color-int from red, green, blue components.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#rgb(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.rgb(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#rgb(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.rgb(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2373,12 +2340,12 @@
       </Parameters>
       <Docs>
         <param name="color">To be added.</param>
-        <summary>Converts this color to an ARGB color int.</summary>
+        <summary>Converts the specified color long to an ARGB color int.</summary>
         <returns>An ARGB color in the sRGB color space</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#toArgb()" title="Reference documentation">Java documentation for <code>android.graphics.Color.toArgb()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#toArgb(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.toArgb(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2439,17 +2406,13 @@
         <Parameter Name="color" Type="Android.Graphics.Color" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <param name="r">The red component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="g">The green component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="b">The blue component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <summary>Creates a new opaque &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
-            color space with the specified red, green and blue component values.</summary>
+        <param name="color">The ARGB color int to create a &lt;code&gt;Color&lt;/code&gt; from</param>
+        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; instance from an ARGB color int.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(int)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2483,17 +2446,13 @@
         <Parameter Name="color" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <param name="r">The red component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="g">The green component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="b">The blue component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <summary>Creates a new opaque &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
-            color space with the specified red, green and blue component values.</summary>
+        <param name="color">The color long to create a &lt;code&gt;Color&lt;/code&gt; from</param>
+        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; instance from a color long.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(long)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2528,18 +2487,15 @@
         <Parameter Name="colorSpace" Type="Android.Graphics.ColorSpace" />
       </Parameters>
       <Docs>
-        <param name="components">To be added.</param>
-        <param name="colorSpace">To be added.</param>
-        <param name="r">The red component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="g">The green component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="b">The blue component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <summary>Creates a new opaque &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
-            color space with the specified red, green and blue component values.</summary>
+        <param name="components">The components of the color to create, with alpha as the last component</param>
+        <param name="colorSpace">The color space of the color to create</param>
+        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; in the specified color space with the
+            specified component values.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float[],%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float[], android.graphics.ColorSpace)</code>.</a>
             </format>
           </para>
           <para>
@@ -2621,17 +2577,17 @@
         <Parameter Name="a" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="r">The red component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="g">The green component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="b">The blue component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <summary>Creates a new opaque &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
-            color space with the specified red, green and blue component values.</summary>
+        <param name="r">The red component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="g">The green component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="b">The blue component of the sRGB color to create, in \([0..1]\)</param>
+        <param name="a">The alpha component of the sRGB color to create, in \([0..1]\)</param>
+        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
+            color space with the specified red, green, blue and alpha component values.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2669,18 +2625,18 @@
         <Parameter Name="colorSpace" Type="Android.Graphics.ColorSpace" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="colorSpace">To be added.</param>
-        <param name="r">The red component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="g">The green component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <param name="b">The blue component of the opaque sRGB color to create, in \([0..1]\)</param>
-        <summary>Creates a new opaque &lt;code&gt;Color&lt;/code&gt; in the <c>ColorSpace.Named#SRGB sRGB</c>
-            color space with the specified red, green and blue component values.</summary>
+        <param name="r">The red component of the color to create</param>
+        <param name="g">The green component of the color to create</param>
+        <param name="b">The blue component of the color to create</param>
+        <param name="a">The alpha component of the color to create, in \([0..1]\)</param>
+        <param name="colorSpace">The color space of the color to create</param>
+        <summary>Creates a new &lt;code&gt;Color&lt;/code&gt; in the specified color space with the
+            specified red, green, blue and alpha component values.</summary>
         <returns>A non-null instance of <c>Color</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Color#valueOf(float,%20float,%20float,%20float,%20android.graphics.ColorSpace)" title="Reference documentation">Java documentation for <code>android.graphics.Color.valueOf(float, float, float, float, android.graphics.ColorSpace)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/ColorSpace.xml b/docs/Mono.Android/en/Android.Graphics/ColorSpace.xml
index 70e60d3103..d7364a47fd 100644
--- a/docs/Mono.Android/en/Android.Graphics/ColorSpace.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ColorSpace.xml
@@ -121,9 +121,9 @@
         <Parameter Name="adaptation" Type="Android.Graphics.ColorSpace+Adaptation" />
       </Parameters>
       <Docs>
-        <param name="adaptation">To be added.</param>
         <param name="colorSpace">The color space to chromatically adapt</param>
         <param name="whitePoint">The new white point</param>
+        <param name="adaptation">To be added.</param>
         <summary>Performs the chromatic adaptation of a color space from its native
             white point to the specified white point.</summary>
         <returns>A <c>ColorSpace</c> instance with the same name, primaries,
@@ -329,8 +329,8 @@
         <Parameter Name="destination" Type="Android.Graphics.ColorSpace" />
       </Parameters>
       <Docs>
-        <param name="destination">To be added.</param>
         <param name="source">The color space to convert colors from</param>
+        <param name="destination">To be added.</param>
         <summary>Connects the specified color spaces to sRGB.</summary>
         <returns>A non-null connector between the specified color space and sRGB</returns>
         <remarks>
@@ -371,8 +371,8 @@
         <Parameter Name="intent" Type="Android.Graphics.ColorSpace+RenderIntent" />
       </Parameters>
       <Docs>
-        <param name="intent">To be added.</param>
         <param name="source">The color space to convert colors from</param>
+        <param name="intent">To be added.</param>
         <summary>Connects the specified color spaces to sRGB.</summary>
         <returns>A non-null connector between the specified color space and sRGB</returns>
         <remarks>
@@ -414,9 +414,9 @@
         <Parameter Name="intent" Type="Android.Graphics.ColorSpace+RenderIntent" />
       </Parameters>
       <Docs>
+        <param name="source">The color space to convert colors from</param>
         <param name="destination">To be added.</param>
         <param name="intent">To be added.</param>
-        <param name="source">The color space to convert colors from</param>
         <summary>Connects the specified color spaces to sRGB.</summary>
         <returns>A non-null connector between the specified color space and sRGB</returns>
         <remarks>
@@ -456,18 +456,16 @@
         <Parameter Name="v" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="v">To be added.</param>
-        <param name="x">The X component of the color value</param>
-        <param name="y">The Y component of the color value</param>
-        <param name="z">The Z component of the color value</param>
-        <summary>Converts tristimulus values from the CIE XYZ space to this
-            color space's color model.</summary>
-        <returns>A new array whose size is equal to the number of color
-                    components as returned by <c>Model#getComponentCount()</c></returns>
+        <param name="v">An array of color components containing the XYZ values
+                     to convert from, and large enough to hold the number
+                     of components of this color space's model</param>
+        <summary>Converts tristimulus values from the CIE XYZ space to this color
+            space's color model.</summary>
+        <returns>The array passed in parameter</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/ColorSpace#fromXyz(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.ColorSpace.fromXyz(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/ColorSpace#fromXyz(float[])" title="Reference documentation">Java documentation for <code>android.graphics.ColorSpace.fromXyz(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -548,7 +546,6 @@
       </Parameters>
       <Docs>
         <param name="name">To be added.</param>
-        <param name="index">An integer ID between <c>#MIN_ID</c> and <c>#MAX_ID</c></param>
         <summary>Returns an instance of <c>ColorSpace</c> whose ID matches the
             specified ID.</summary>
         <returns>A non-null <c>ColorSpace</c> instance</returns>
@@ -1369,17 +1366,16 @@
         <Parameter Name="v" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="v">To be added.</param>
-        <param name="r">The first component of the value to convert from (typically R in RGB)</param>
-        <param name="g">The second component of the value to convert from (typically G in RGB)</param>
-        <param name="b">The third component of the value to convert from (typically B in RGB)</param>
+        <param name="v">An array of color components containing the color space's
+                     color value to convert to XYZ, and large enough to hold
+                     the resulting tristimulus XYZ values</param>
         <summary>Converts a color value from this color space's model to
             tristimulus CIE XYZ values.</summary>
-        <returns>A new array of 3 floats, containing tristimulus XYZ values</returns>
+        <returns>The array passed in parameter</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/ColorSpace#toXyz(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.ColorSpace.toXyz(float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/ColorSpace#toXyz(float[])" title="Reference documentation">Java documentation for <code>android.graphics.ColorSpace.toXyz(float[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/ComposeShader.xml b/docs/Mono.Android/en/Android.Graphics/ComposeShader.xml
index 996be8fa52..679dfc5472 100644
--- a/docs/Mono.Android/en/Android.Graphics/ComposeShader.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ComposeShader.xml
@@ -120,10 +120,9 @@
         <Parameter Name="mode" Type="Android.Graphics.PorterDuff+Mode" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
         <param name="shaderA">The colors from this shader are seen as the "dst" by the mode</param>
         <param name="shaderB">The colors from this shader are seen as the "src" by the mode</param>
-        <param name="blendMode">The blend mode that combines the colors from the two shaders.</param>
+        <param name="mode">To be added.</param>
         <summary>Create a new compose shader, given shaders A, B, and a combining PorterDuff mode.</summary>
         <remarks>
           <para>
@@ -166,15 +165,15 @@
         <Parameter Name="mode" Type="Android.Graphics.Xfermode" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
         <param name="shaderA">The colors from this shader are seen as the "dst" by the mode</param>
         <param name="shaderB">The colors from this shader are seen as the "src" by the mode</param>
-        <param name="blendMode">The blend mode that combines the colors from the two shaders.</param>
-        <summary>Create a new compose shader, given shaders A, B, and a combining PorterDuff mode.</summary>
+        <param name="mode">The mode that combines the colors from the two shaders. If mode
+                            is null, then SRC_OVER is assumed.</param>
+        <summary>Create a new compose shader, given shaders A, B, and a combining mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/ComposeShader#ComposeShader(android.graphics.Shader,%20android.graphics.Shader,%20android.graphics.BlendMode)" title="Reference documentation">Java documentation for <code>android.graphics.ComposeShader.ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.BlendMode)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/ComposeShader#ComposeShader(android.graphics.Shader,%20android.graphics.Shader,%20android.graphics.Xfermode)" title="Reference documentation">Java documentation for <code>android.graphics.ComposeShader.ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/ImageDecoder.xml b/docs/Mono.Android/en/Android.Graphics/ImageDecoder.xml
index a1aaf98cb2..a31536429a 100644
--- a/docs/Mono.Android/en/Android.Graphics/ImageDecoder.xml
+++ b/docs/Mono.Android/en/Android.Graphics/ImageDecoder.xml
@@ -258,8 +258,6 @@
       </Parameters>
       <Docs>
         <param name="file">To be added.</param>
-        <param name="cr">to retrieve from.</param>
-        <param name="uri">of the image file.</param>
         <summary>Create a new <c>Source</c> from a <c>android.net.Uri</c>.</summary>
         <returns>a new Source object, which can be passed to
                  <c>#decodeDrawable</c> or <c>#decodeBitmap</c>.</returns>
@@ -301,8 +299,6 @@
       </Parameters>
       <Docs>
         <param name="buffer">To be added.</param>
-        <param name="cr">to retrieve from.</param>
-        <param name="uri">of the image file.</param>
         <summary>Create a new <c>Source</c> from a <c>android.net.Uri</c>.</summary>
         <returns>a new Source object, which can be passed to
                  <c>#decodeDrawable</c> or <c>#decodeBitmap</c>.</returns>
@@ -344,8 +340,6 @@
       </Parameters>
       <Docs>
         <param name="callable">To be added.</param>
-        <param name="cr">to retrieve from.</param>
-        <param name="uri">of the image file.</param>
         <summary>Create a new <c>Source</c> from a <c>android.net.Uri</c>.</summary>
         <returns>a new Source object, which can be passed to
                  <c>#decodeDrawable</c> or <c>#decodeBitmap</c>.</returns>
@@ -387,8 +381,6 @@
       </Parameters>
       <Docs>
         <param name="data">To be added.</param>
-        <param name="cr">to retrieve from.</param>
-        <param name="uri">of the image file.</param>
         <summary>Create a new <c>Source</c> from a <c>android.net.Uri</c>.</summary>
         <returns>a new Source object, which can be passed to
                  <c>#decodeDrawable</c> or <c>#decodeBitmap</c>.</returns>
@@ -475,8 +467,6 @@
       <Docs>
         <param name="assets">To be added.</param>
         <param name="fileName">To be added.</param>
-        <param name="cr">to retrieve from.</param>
-        <param name="uri">of the image file.</param>
         <summary>Create a new <c>Source</c> from a <c>android.net.Uri</c>.</summary>
         <returns>a new Source object, which can be passed to
                  <c>#decodeDrawable</c> or <c>#decodeBitmap</c>.</returns>
@@ -520,8 +510,6 @@
       <Docs>
         <param name="res">To be added.</param>
         <param name="resId">To be added.</param>
-        <param name="cr">to retrieve from.</param>
-        <param name="uri">of the image file.</param>
         <summary>Create a new <c>Source</c> from a <c>android.net.Uri</c>.</summary>
         <returns>a new Source object, which can be passed to
                  <c>#decodeDrawable</c> or <c>#decodeBitmap</c>.</returns>
@@ -567,8 +555,6 @@
         <param name="data">To be added.</param>
         <param name="offset">To be added.</param>
         <param name="length">To be added.</param>
-        <param name="cr">to retrieve from.</param>
-        <param name="uri">of the image file.</param>
         <summary>Create a new <c>Source</c> from a <c>android.net.Uri</c>.</summary>
         <returns>a new Source object, which can be passed to
                  <c>#decodeDrawable</c> or <c>#decodeBitmap</c>.</returns>
diff --git a/docs/Mono.Android/en/Android.Graphics/Insets.xml b/docs/Mono.Android/en/Android.Graphics/Insets.xml
index 2949643a7f..52ba039306 100644
--- a/docs/Mono.Android/en/Android.Graphics/Insets.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Insets.xml
@@ -357,17 +357,13 @@
         <Parameter Name="r" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="r">To be added.</param>
-        <param name="left">the left inset</param>
-        <param name="top">the top inset</param>
-        <param name="right">the right inset</param>
-        <param name="bottom">the bottom inset</param>
+        <param name="r">the rectangle from which to take the values</param>
         <summary>Return an Insets instance with the appropriate values.</summary>
-        <returns>Insets instance with the appropriate values</returns>
+        <returns>an Insets instance with the appropriate values</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Insets#of(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Insets.of(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Insets#of(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Insets.of(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Interpolator.xml b/docs/Mono.Android/en/Android.Graphics/Interpolator.xml
index 28818fd547..8529bc45ce 100644
--- a/docs/Mono.Android/en/Android.Graphics/Interpolator.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Interpolator.xml
@@ -239,12 +239,12 @@
       <Docs>
         <param name="valueCount">To be added.</param>
         <param name="frameCount">To be added.</param>
-        <summary>Reset the Interpolator to have the specified number of values and an
-            implicit keyFrame count of 2 (just a start and end).</summary>
+        <summary>Reset the Interpolator to have the specified number of values and
+            keyFrames.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Interpolator#reset(int)" title="Reference documentation">Java documentation for <code>android.graphics.Interpolator.reset(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Interpolator#reset(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Interpolator.reset(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -329,19 +329,17 @@
         <Parameter Name="blend" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="blend">(may be null) Optional array of 4 blend values
-</param>
         <param name="index">The index of the key frame to assign</param>
         <param name="msec">The time (in mililiseconds) for this key frame. Based on the
                    SystemClock.uptimeMillis() clock</param>
         <param name="values">Array of values associated with theis key frame</param>
+        <param name="blend">(may be null) Optional array of 4 blend values</param>
         <summary>Assign the keyFrame (specified by index) a time value and an array of key
-            values (with an implicity blend array of [0, 0, 1, 1] giving linear
-            transition to the next set of key values).</summary>
+            values and blend array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Interpolator#setKeyFrame(int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Interpolator.setKeyFrame(int, int, float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Interpolator#setKeyFrame(int,%20int,%20float[],%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Interpolator.setKeyFrame(int, int, float[], float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -481,8 +479,6 @@
         <Parameter Name="values" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="msec">The time (in milliseconds) used to sample into the
-                   Interpolator. Based on the SystemClock.uptimeMillis() clock</param>
         <param name="values">Where to write the computed values (may be NULL).</param>
         <summary>Given a millisecond time value (msec), return the interpolated values and
             return whether the specified time was within the range of key times
diff --git a/docs/Mono.Android/en/Android.Graphics/LinearGradient.xml b/docs/Mono.Android/en/Android.Graphics/LinearGradient.xml
index 6b7f429ba5..f437babcb7 100644
--- a/docs/Mono.Android/en/Android.Graphics/LinearGradient.xml
+++ b/docs/Mono.Android/en/Android.Graphics/LinearGradient.xml
@@ -127,14 +127,12 @@
         <Parameter Name="tile" Type="Android.Graphics.Shader+TileMode" />
       </Parameters>
       <Docs>
-        <param name="colors">To be added.</param>
-        <param name="positions">To be added.</param>
         <param name="x0">The x-coordinate for the start of the gradient line</param>
         <param name="y0">The y-coordinate for the start of the gradient line</param>
         <param name="x1">The x-coordinate for the end of the gradient line</param>
         <param name="y1">The y-coordinate for the end of the gradient line</param>
-        <param name="color0">The sRGB color at the start of the gradient line.</param>
-        <param name="color1">The sRGB color at the end of the gradient line.</param>
+        <param name="colors">To be added.</param>
+        <param name="positions">To be added.</param>
         <param name="tile">The Shader tiling mode</param>
         <summary>Create a shader that draws a linear gradient along a line.</summary>
         <remarks>
@@ -226,14 +224,12 @@
         <Parameter Name="tile" Type="Android.Graphics.Shader+TileMode" />
       </Parameters>
       <Docs>
-        <param name="colors">To be added.</param>
-        <param name="positions">To be added.</param>
         <param name="x0">The x-coordinate for the start of the gradient line</param>
         <param name="y0">The y-coordinate for the start of the gradient line</param>
         <param name="x1">The x-coordinate for the end of the gradient line</param>
         <param name="y1">The y-coordinate for the end of the gradient line</param>
-        <param name="color0">The sRGB color at the start of the gradient line.</param>
-        <param name="color1">The sRGB color at the end of the gradient line.</param>
+        <param name="colors">To be added.</param>
+        <param name="positions">To be added.</param>
         <param name="tile">The Shader tiling mode</param>
         <summary>Create a shader that draws a linear gradient along a line.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Graphics/Matrix.xml b/docs/Mono.Android/en/Android.Graphics/Matrix.xml
index 5de0d1d720..6804cc077f 100644
--- a/docs/Mono.Android/en/Android.Graphics/Matrix.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Matrix.xml
@@ -87,12 +87,12 @@
         <Parameter Name="src" Type="Android.Graphics.Matrix" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <summary>Create an identity matrix</summary>
+        <param name="src">The matrix to copy into this matrix</param>
+        <summary>Create a matrix that is a (deep) copy of src</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#Matrix()" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.Matrix()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#Matrix(android.graphics.Matrix)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.Matrix(android.graphics.Matrix)</code>.</a>
             </format>
           </para>
           <para>
@@ -456,15 +456,13 @@
       </Parameters>
       <Docs>
         <param name="dst">The array of dst points (x,y pairs)</param>
-        <param name="src">The array of src points (x,y pairs)
-</param>
-        <param name="pts">The array [x0, y0, x1, y1, ...] of points to transform.</param>
-        <summary>Apply this matrix to the array of 2D points, and write the transformed points back into the
-            array</summary>
+        <param name="src">The array of src points (x,y pairs)</param>
+        <summary>Apply this matrix to the array of 2D points specified by src, and write the transformed
+            points into the array of points specified by dst.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapPoints(float[])" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapPoints(float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapPoints(float[],%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapPoints(float[], float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -507,15 +505,13 @@
         <param name="dstIndex">The index of the first [x,y] pair of dst floats</param>
         <param name="src">The array of src points (x,y pairs)</param>
         <param name="srcIndex">The index of the first [x,y] pair of src floats</param>
-        <param name="pointCount">The number of points (x,y pairs) to transform
-</param>
-        <param name="pts">The array [x0, y0, x1, y1, ...] of points to transform.</param>
-        <summary>Apply this matrix to the array of 2D points, and write the transformed points back into the
-            array</summary>
+        <param name="pointCount">The number of points (x,y pairs) to transform</param>
+        <summary>Apply this matrix to the array of 2D points specified by src, and write the transformed
+            points into the array of points specified by dst.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapPoints(float[])" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapPoints(float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapPoints(float[],%20int,%20float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapPoints(float[], int, float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -635,13 +631,12 @@
       <Docs>
         <param name="dst">Where the transformed rectangle is written.</param>
         <param name="src">The original rectangle to be transformed.</param>
-        <param name="rect">The rectangle to transform.</param>
-        <summary>Apply this matrix to the rectangle, and write the transformed rectangle back into it.</summary>
+        <summary>Apply this matrix to the src rectangle, and write the transformed rectangle into dst.</summary>
         <returns>the result of calling rectStaysRect()</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapRect(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapRect(android.graphics.RectF)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapRect(android.graphics.RectF,%20android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapRect(android.graphics.RectF, android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -719,15 +714,13 @@
       </Parameters>
       <Docs>
         <param name="dst">The array of dst vectors (x,y pairs)</param>
-        <param name="src">The array of src vectors (x,y pairs)
-</param>
-        <param name="vecs">The array [x0, y0, x1, y1, ...] of vectors to transform.</param>
-        <summary>Apply this matrix to the array of 2D vectors, and write the transformed vectors back into the
-            array.</summary>
+        <param name="src">The array of src vectors (x,y pairs)</param>
+        <summary>Apply this matrix to the array of 2D vectors specified by src, and write the transformed
+            vectors into the array of vectors specified by dst.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapVectors(float[])" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapVectors(float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapVectors(float[],%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapVectors(float[], float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -770,15 +763,13 @@
         <param name="dstIndex">The index of the first [x,y] pair of dst floats</param>
         <param name="src">The array of src vectors (x,y pairs)</param>
         <param name="srcIndex">The index of the first [x,y] pair of src floats</param>
-        <param name="vectorCount">The number of vectors (x,y pairs) to transform
-</param>
-        <param name="vecs">The array [x0, y0, x1, y1, ...] of vectors to transform.</param>
-        <summary>Apply this matrix to the array of 2D vectors, and write the transformed vectors back into the
-            array.</summary>
+        <param name="vectorCount">The number of vectors (x,y pairs) to transform</param>
+        <summary>Apply this matrix to the array of 2D vectors specified by src, and write the transformed
+            vectors into the array of vectors specified by dst.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapVectors(float[])" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapVectors(float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#mapVectors(float[],%20int,%20float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.mapVectors(float[], int, float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1166,7 +1157,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#postRotate(float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.postRotate(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#postRotate(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.postRotate(float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1256,7 +1247,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#postScale(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.postScale(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#postScale(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.postScale(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1346,7 +1337,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#postSkew(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.postSkew(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#postSkew(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.postSkew(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1516,7 +1507,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#preRotate(float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.preRotate(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#preRotate(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.preRotate(float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1606,7 +1597,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#preScale(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.preScale(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#preScale(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.preScale(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1696,7 +1687,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#preSkew(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.preSkew(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#preSkew(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.preSkew(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2072,11 +2063,11 @@
         <param name="degrees">To be added.</param>
         <param name="px">To be added.</param>
         <param name="py">To be added.</param>
-        <summary>Set the matrix to rotate about (0,0) by the specified number of degrees.</summary>
+        <summary>Set the matrix to rotate by the specified number of degrees, with a pivot point at (px, py).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#setRotate(float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setRotate(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#setRotate(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setRotate(float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2160,11 +2151,11 @@
         <param name="sy">To be added.</param>
         <param name="px">To be added.</param>
         <param name="py">To be added.</param>
-        <summary>Set the matrix to scale by sx and sy.</summary>
+        <summary>Set the matrix to scale by sx and sy, with a pivot point at (px, py).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#setScale(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setScale(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#setScale(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setScale(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2248,11 +2239,12 @@
         <param name="cosValue">To be added.</param>
         <param name="px">To be added.</param>
         <param name="py">To be added.</param>
-        <summary>Set the matrix to rotate by the specified sine and cosine values.</summary>
+        <summary>Set the matrix to rotate by the specified sine and cosine values, with a pivot point at (px,
+            py).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#setSinCos(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setSinCos(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#setSinCos(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setSinCos(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2336,11 +2328,11 @@
         <param name="ky">To be added.</param>
         <param name="px">To be added.</param>
         <param name="py">To be added.</param>
-        <summary>Set the matrix to skew by sx and sy.</summary>
+        <summary>Set the matrix to skew by sx and sy, with a pivot point at (px, py).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Matrix#setSkew(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setSkew(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Matrix#setSkew(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Matrix.setSkew(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/NinePatch.xml b/docs/Mono.Android/en/Android.Graphics/NinePatch.xml
index 59f00c661e..29569429d9 100644
--- a/docs/Mono.Android/en/Android.Graphics/NinePatch.xml
+++ b/docs/Mono.Android/en/Android.Graphics/NinePatch.xml
@@ -118,15 +118,15 @@
         <Parameter Name="srcName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="srcName">To be added.</param>
         <param name="bitmap">The bitmap describing the patches.</param>
-        <param name="chunk">The 9-patch data chunk describing how the underlying bitmap
-                         is split apart and drawn.</param>
+        <param name="chunk">The 9-patch data chunk describing how the underlying
+                         bitmap is split apart and drawn.</param>
+        <param name="srcName">The name of the source for the bitmap. Might be null.</param>
         <summary>Create a drawable projection from a bitmap to nine patches.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/NinePatch#NinePatch(android.graphics.Bitmap,%20byte[])" title="Reference documentation">Java documentation for <code>android.graphics.NinePatch.NinePatch(android.graphics.Bitmap, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/NinePatch#NinePatch(android.graphics.Bitmap,%20byte[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.NinePatch.NinePatch(android.graphics.Bitmap, byte[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -284,7 +284,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/NinePatch#draw(android.graphics.Canvas,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.NinePatch.draw(android.graphics.Canvas, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/NinePatch#draw(android.graphics.Canvas,%20android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.NinePatch.draw(android.graphics.Canvas, android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -321,15 +321,14 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="paint">The Paint to draw through.
-</param>
         <param name="canvas">A container for the current matrix and clip used to draw the NinePatch.</param>
         <param name="location">Where to draw the NinePatch.</param>
+        <param name="paint">The Paint to draw through.</param>
         <summary>Draws the NinePatch.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/NinePatch#draw(android.graphics.Canvas,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.NinePatch.draw(android.graphics.Canvas, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/NinePatch#draw(android.graphics.Canvas,%20android.graphics.Rect,%20android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.NinePatch.draw(android.graphics.Canvas, android.graphics.Rect, android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Outline.xml b/docs/Mono.Android/en/Android.Graphics/Outline.xml
index cf4e25183e..fe2de664bb 100644
--- a/docs/Mono.Android/en/Android.Graphics/Outline.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Outline.xml
@@ -86,11 +86,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Constructs an empty Outline.</summary>
+        <summary>Constructs an Outline with a copy of the data in src.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Outline#Outline()" title="Reference documentation">Java documentation for <code>android.graphics.Outline.Outline()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Outline#Outline(android.graphics.Outline)" title="Reference documentation">Java documentation for <code>android.graphics.Outline.Outline(android.graphics.Outline)</code>.</a>
             </format>
           </para>
           <para>
@@ -512,11 +512,11 @@
       </Parameters>
       <Docs>
         <param name="rect">To be added.</param>
-        <summary>Sets the outline to the oval defined by input rect.</summary>
+        <summary>Convenience for <c>#setOval(int, int, int, int)</c></summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Outline#setOval(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Outline.setOval(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Outline#setOval(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Outline.setOval(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -635,12 +635,11 @@
       </Parameters>
       <Docs>
         <param name="rect">To be added.</param>
-        <summary>Sets the Outline to the rounded rect defined by the input rect, and
-            corner radius.</summary>
+        <summary>Convenience for <c>#setRect(int, int, int, int)</c></summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Outline#setRect(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Outline.setRect(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Outline#setRect(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Outline.setRect(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -723,11 +722,11 @@
       <Docs>
         <param name="rect">To be added.</param>
         <param name="radius">To be added.</param>
-        <summary>Sets the Outline to the rounded rect defined by the input rect, and corner radius.</summary>
+        <summary>Convenience for <c>#setRoundRect(int, int, int, int, float)</c></summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Outline#setRoundRect(int,%20int,%20int,%20int,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Outline.setRoundRect(int, int, int, int, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Outline#setRoundRect(android.graphics.Rect,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Outline.setRoundRect(android.graphics.Rect, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Paint.xml b/docs/Mono.Android/en/Android.Graphics/Paint.xml
index 9443069c0b..c57a0cf507 100644
--- a/docs/Mono.Android/en/Android.Graphics/Paint.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Paint.xml
@@ -88,12 +88,14 @@
         <Parameter Name="paint" Type="Android.Graphics.Paint" />
       </Parameters>
       <Docs>
-        <param name="paint">To be added.</param>
-        <summary>Create a new paint with default settings.</summary>
+        <param name="paint">Existing paint used to initialized the attributes of the
+                         new paint.</param>
+        <summary>Create a new paint, initialized with the attributes in the specified
+            paint parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#Paint()" title="Reference documentation">Java documentation for <code>android.graphics.Paint.Paint()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#Paint(android.graphics.Paint)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.Paint(android.graphics.Paint)</code>.</a>
             </format>
           </para>
           <para>
@@ -132,12 +134,12 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
-        <summary>Create a new paint with default settings.</summary>
+        <param name="flags">initial flag bits, as if they were passed via setFlags().</param>
+        <summary>Create a new paint with the specified flags.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#Paint()" title="Reference documentation">Java documentation for <code>android.graphics.Paint.Paint()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#Paint(int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.Paint(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1938,12 +1940,13 @@
         <param name="contextEnd">the index + 1 of the end of the range to measure</param>
         <param name="isRtl">whether the run is in RTL direction</param>
         <param name="advance">width relative to start of run</param>
-        <summary>To be added.</summary>
+        <summary>Get the character offset within the string whose position is closest to the specified
+            horizontal position.</summary>
         <returns>index of offset</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getOffsetForAdvance(java.lang.CharSequence,%20int,%20int,%20int,%20int,%20boolean,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getOffsetForAdvance(char[],%20int,%20int,%20int,%20int,%20boolean,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getOffsetForAdvance(char[], int, int, int, int, boolean, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2088,12 +2091,12 @@
         <param name="contextEnd">the index + 1 of the end of the shaping context</param>
         <param name="isRtl">whether the run is in RTL direction</param>
         <param name="offset">index of caret position</param>
-        <summary>To be added.</summary>
+        <summary>Measure cursor position within a run of text.</summary>
         <returns>width measurement between start and offset</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getRunAdvance(java.lang.CharSequence,%20int,%20int,%20int,%20int,%20boolean,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getRunAdvance(char[],%20int,%20int,%20int,%20int,%20boolean,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getRunAdvance(char[], int, int, int, int, boolean, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2261,17 +2264,16 @@
         <Parameter Name="bounds" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="index">Index of the first char in the array to measure</param>
-        <param name="count">The number of chars, beginning at index, to measure</param>
-        <param name="text">text to measure and return its bounds</param>
-        <param name="start">index of the first char in the text to measure</param>
-        <param name="end">1 past the last char in the text to measure</param>
+        <param name="text">array of chars to measure and return their unioned bounds</param>
+        <param name="index">index of the first char in the array to measure</param>
+        <param name="count">the number of chars, beginning at index, to measure</param>
         <param name="bounds">returns the unioned bounds of all the text. Must be allocated by the caller</param>
-        <summary>Retrieve the text boundary box and store to bounds.</summary>
+        <summary>Return in bounds (allocated by the caller) the smallest rectangle that
+            encloses all of the characters, with an implied origin at (0,0).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextBounds(java.lang.CharSequence,%20int,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextBounds(java.lang.CharSequence, int, int, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextBounds(char[],%20int,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextBounds(char[], int, int, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -2309,15 +2311,15 @@
         <Parameter Name="bounds" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="text">text to measure and return its bounds</param>
-        <param name="start">index of the first char in the text to measure</param>
-        <param name="end">1 past the last char in the text to measure</param>
+        <param name="text">string to measure and return its bounds</param>
+        <param name="start">index of the first char in the string to measure</param>
+        <param name="end">1 past the last char in the string to measure</param>
         <param name="bounds">returns the unioned bounds of all the text. Must be allocated by the caller</param>
         <summary>Retrieve the text boundary box and store to bounds.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextBounds(java.lang.CharSequence,%20int,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextBounds(java.lang.CharSequence, int, int, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextBounds(java.lang.String,%20int,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextBounds(java.lang.String, int, int, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -2357,11 +2359,9 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="index">The index of the first character in text</param>
-        <param name="count">The number of characterss starting with index</param>
         <param name="text">the text to retrieve the path from</param>
-        <param name="start">the first character in the text</param>
-        <param name="end">1 past the last character in the text</param>
+        <param name="index">the index of the first character in text</param>
+        <param name="count">the number of characters starting with index</param>
         <param name="x">the x coordinate of the text's origin</param>
         <param name="y">the y coordinate of the text's origin</param>
         <param name="path">the path to receive the data describing the text. Must be allocated by the caller</param>
@@ -2369,7 +2369,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextPath(java.lang.String,%20int,%20int,%20float,%20float,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextPath(java.lang.String, int, int, float, float, android.graphics.Path)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextPath(char[],%20int,%20int,%20float,%20float,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextPath(char[], int, int, float, float, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -2581,10 +2581,9 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="contextLength">To be added.</param>
         <param name="text">the text</param>
         <param name="contextStart">the start of the context</param>
-        <param name="contextEnd">the end of the context</param>
+        <param name="contextLength">the length of the context</param>
         <param name="isRtl">true if the paragraph context is RTL, otherwise false</param>
         <param name="offset">the cursor position to move from</param>
         <param name="cursorOpt">how to move the cursor</param>
@@ -2593,7 +2592,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextRunCursor(java.lang.CharSequence,%20int,%20int,%20boolean,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextRunCursor(java.lang.CharSequence, int, int, boolean, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextRunCursor(char[],%20int,%20int,%20boolean,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextRunCursor(char[], int, int, boolean, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2679,17 +2678,15 @@
         <Parameter Name="widths" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="text">The text to measure. Cannot be null.</param>
-        <param name="start">The index of the first char to to measure</param>
-        <param name="end">The end of the text slice to measure</param>
+        <param name="text">The text to measure</param>
         <param name="widths">array to receive the advance widths of the characters.
-                            Must be at least a large as (end - start).</param>
+                          Must be at least a large as the text.</param>
         <summary>Return the advance widths for the characters in the string.</summary>
-        <returns>the actual number of widths returned.</returns>
+        <returns>the number of code units in the specified text.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextWidths(java.lang.CharSequence,%20int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextWidths(java.lang.CharSequence, int, int, float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextWidths(java.lang.String,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextWidths(java.lang.String, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2775,19 +2772,17 @@
         <Parameter Name="widths" Type="System.Single[]" />
       </Parameters>
       <Docs>
+        <param name="text">The text to measure. Cannot be null.</param>
         <param name="index">The index of the first char to to measure</param>
         <param name="count">The number of chars starting with index to measure</param>
-        <param name="text">The text to measure. Cannot be null.</param>
-        <param name="start">The index of the first char to to measure</param>
-        <param name="end">The end of the text slice to measure</param>
         <param name="widths">array to receive the advance widths of the characters.
-                            Must be at least a large as (end - start).</param>
+                            Must be at least a large as count.</param>
         <summary>Return the advance widths for the characters in the string.</summary>
         <returns>the actual number of widths returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextWidths(java.lang.CharSequence,%20int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextWidths(java.lang.CharSequence, int, int, float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextWidths(char[],%20int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextWidths(char[], int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2829,13 +2824,13 @@
         <param name="start">The index of the first char to to measure</param>
         <param name="end">The end of the text slice to measure</param>
         <param name="widths">array to receive the advance widths of the characters.
-                            Must be at least a large as (end - start).</param>
+                          Must be at least a large as the text.</param>
         <summary>Return the advance widths for the characters in the string.</summary>
-        <returns>the actual number of widths returned.</returns>
+        <returns>the number of code units in the specified text.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextWidths(java.lang.CharSequence,%20int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextWidths(java.lang.CharSequence, int, int, float[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#getTextWidths(java.lang.String,%20int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.Paint.getTextWidths(java.lang.String, int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3208,15 +3203,13 @@
         <Parameter Name="text" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="text">The text to measure</param>
-        <param name="start">The index of the first character to start measuring</param>
-        <param name="end">1 beyond the index of the last character to measure</param>
+        <param name="text">The text to measure. Cannot be null.</param>
         <summary>Return the width of the text.</summary>
         <returns>The width of the text</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#measureText(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.measureText(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#measureText(java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.measureText(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3298,17 +3291,15 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="text">The text to measure. Cannot be null.</param>
         <param name="index">The index of the first character to start measuring</param>
         <param name="count">THe number of characters to measure, beginning with start</param>
-        <param name="text">The text to measure</param>
-        <param name="start">The index of the first character to start measuring</param>
-        <param name="end">1 beyond the index of the last character to measure</param>
         <summary>Return the width of the text.</summary>
         <returns>The width of the text</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#measureText(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.measureText(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#measureText(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.measureText(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3345,7 +3336,7 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="text">The text to measure</param>
+        <param name="text">The text to measure. Cannot be null.</param>
         <param name="start">The index of the first character to start measuring</param>
         <param name="end">1 beyond the index of the last character to measure</param>
         <summary>Return the width of the text.</summary>
@@ -3353,7 +3344,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#measureText(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.measureText(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#measureText(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.measureText(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3884,7 +3875,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Paint#setShadowLayer(float,%20float,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.setShadowLayer(float, float, float, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Paint#setShadowLayer(float,%20float,%20float,%20long)" title="Reference documentation">Java documentation for <code>android.graphics.Paint.setShadowLayer(float, float, float, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4538,8 +4529,6 @@
         <ReturnType>Android.Graphics.Paint+Cap</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="cap">set the paint's line cap style, used whenever the paint's
-                       style is Stroke or StrokeAndFill.</param>
         <summary>Return the paint's Cap, controlling how the start and end of stroked
             lines and paths are treated. -or- Set the paint's Cap.</summary>
         <value>the line cap style for the paint, used whenever the paint's
@@ -4590,8 +4579,6 @@
         <ReturnType>Android.Graphics.Paint+Join</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="join">set the paint's Join, used whenever the paint's style is
-                        Stroke or StrokeAndFill.</param>
         <summary>Return the paint's stroke join type. -or- Set the paint's Join.</summary>
         <value>the paint's Join.</value>
         <remarks>
@@ -4792,7 +4779,6 @@
         <ReturnType>Android.Graphics.Paint+Align</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="align">set the paint's Align value for drawing text.</param>
         <summary>Return the paint's Align value for drawing text. -or- Set the paint's text alignment.</summary>
         <value>the paint's Align value for drawing text.</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Graphics/Path.xml b/docs/Mono.Android/en/Android.Graphics/Path.xml
index f4b884dcf7..45b59d6ecc 100644
--- a/docs/Mono.Android/en/Android.Graphics/Path.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Path.xml
@@ -88,12 +88,12 @@
         <Parameter Name="src" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <summary>Create an empty path</summary>
+        <param name="src">The path to copy from when initializing the new path</param>
+        <summary>Create a new path, copying the contents from the src path.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#Path()" title="Reference documentation">Java documentation for <code>android.graphics.Path.Path()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#Path(android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Path.Path(android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -160,7 +160,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#addArc(float,%20float,%20float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Path.addArc(float, float, float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#addArc(android.graphics.RectF,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Path.addArc(android.graphics.RectF, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -421,12 +421,12 @@
       </Parameters>
       <Docs>
         <param name="matrix">To be added.</param>
-        <param name="src">The path that is appended to the current path</param>
-        <summary>Add a copy of src to the path</summary>
+        <param name="src">The path to add as a new contour</param>
+        <summary>Add a copy of src to the path, transformed by matrix</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#addPath(android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Path.addPath(android.graphics.Path)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#addPath(android.graphics.Path,%20android.graphics.Matrix)" title="Reference documentation">Java documentation for <code>android.graphics.Path.addPath(android.graphics.Path, android.graphics.Matrix)</code>.</a>
             </format>
           </para>
           <para>
@@ -463,15 +463,14 @@
         <Parameter Name="dy" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="dx">The amount to translate the path in X as it is added
-</param>
         <param name="dy">To be added.</param>
-        <param name="src">The path that is appended to the current path</param>
-        <summary>Add a copy of src to the path</summary>
+        <param name="src">The path to add as a new contour</param>
+        <param name="dx">The amount to translate the path in X as it is added</param>
+        <summary>Add a copy of src to the path, offset by (dx,dy)</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#addPath(android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Path.addPath(android.graphics.Path)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#addPath(android.graphics.Path,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Path.addPath(android.graphics.Path, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -508,10 +507,6 @@
       </Parameters>
       <Docs>
         <param name="rect">The rectangle to add as a closed contour to the path</param>
-        <param name="left">The left side of a rectangle to add to the path</param>
-        <param name="top">The top of a rectangle to add to the path</param>
-        <param name="right">The right side of a rectangle to add to the path</param>
-        <param name="bottom">The bottom of a rectangle to add to the path</param>
         <param name="dir">The direction to wind the rectangle's contour</param>
         <summary>Add a closed rectangle contour to the path</summary>
         <remarks>
@@ -604,8 +599,6 @@
       <Docs>
         <param name="rect">The bounds of a round-rectangle to add to the path</param>
         <param name="radii">Array of 8 values, 4 pairs of [X,Y] radii</param>
-        <param name="rx">The x-radius of the rounded corners on the round-rectangle</param>
-        <param name="ry">The y-radius of the rounded corners on the round-rectangle</param>
         <param name="dir">The direction to wind the round-rectangle's contour</param>
         <summary>Add a closed round-rectangle contour to the path</summary>
         <remarks>
@@ -702,8 +695,6 @@
         <param name="right">To be added.</param>
         <param name="bottom">To be added.</param>
         <param name="radii">Array of 8 values, 4 pairs of [X,Y] radii</param>
-        <param name="rx">The x-radius of the rounded corners on the round-rectangle</param>
-        <param name="ry">The y-radius of the rounded corners on the round-rectangle</param>
         <param name="dir">The direction to wind the round-rectangle's contour</param>
         <summary>Add a closed round-rectangle contour to the path</summary>
         <remarks>
@@ -840,14 +831,12 @@
       <Docs>
         <param name="oval">The bounds of oval defining shape and size of the arc</param>
         <param name="startAngle">Starting angle (in degrees) where the arc begins</param>
-        <param name="sweepAngle">Sweep angle (in degrees) measured clockwise, treated
-                               mod 360.</param>
-        <param name="forceMoveTo">If true, always begin a new contour with the arc</param>
+        <param name="sweepAngle">Sweep angle (in degrees) measured clockwise</param>
         <summary>Append the specified arc to the path as a new contour.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#arcTo(float,%20float,%20float,%20float,%20float,%20float,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.Path.arcTo(float, float, float, float, float, float, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#arcTo(android.graphics.RectF,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Path.arcTo(android.graphics.RectF, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -894,7 +883,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#arcTo(float,%20float,%20float,%20float,%20float,%20float,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.Path.arcTo(float, float, float, float, float, float, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#arcTo(android.graphics.RectF,%20float,%20float,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.Path.arcTo(android.graphics.RectF, float, float, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1192,8 +1181,8 @@
         <Parameter Name="op" Type="Android.Graphics.Path+Op" />
       </Parameters>
       <Docs>
-        <param name="op">To be added.</param>
         <param name="path">The second operand (for difference, the subtrahend)</param>
+        <param name="op">To be added.</param>
         <summary>Set this path to the result of applying the Op to this path and the specified path.</summary>
         <returns>True if operation succeeded, false otherwise and this path remains unmodified.</returns>
         <remarks>
@@ -1239,7 +1228,6 @@
         <param name="path1">The first operand (for difference, the minuend)</param>
         <param name="path2">The second operand (for difference, the subtrahend)</param>
         <param name="op">To be added.</param>
-        <param name="path">The second operand (for difference, the subtrahend)</param>
         <summary>Set this path to the result of applying the Op to this path and the specified path.</summary>
         <returns>True if operation succeeded, false otherwise and this path remains unmodified.</returns>
         <remarks>
@@ -1595,16 +1583,15 @@
         <Parameter Name="dst" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="dst">The translated path is written here. If this is null, then
-            the original path is modified.
-</param>
         <param name="dx">The amount in the X direction to offset the entire path</param>
         <param name="dy">The amount in the Y direction to offset the entire path</param>
+        <param name="dst">The translated path is written here. If this is null, then
+                       the original path is modified.</param>
         <summary>Offset the path by (dx,dy)</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#offset(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.Path.offset(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#offset(float,%20float,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Path.offset(float, float, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -2215,15 +2202,15 @@
         <Parameter Name="dst" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="dst">The transformed path is written here. If dst is null,
-               then the the original path is modified
-</param>
         <param name="matrix">The matrix to apply to the path</param>
-        <summary>Transform the points in this path by matrix.</summary>
+        <param name="dst">The transformed path is written here. If dst is null,
+                          then the the original path is modified</param>
+        <summary>Transform the points in this path by matrix, and write the answer
+            into dst.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Path#transform(android.graphics.Matrix)" title="Reference documentation">Java documentation for <code>android.graphics.Path.transform(android.graphics.Matrix)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Path#transform(android.graphics.Matrix,%20android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Path.transform(android.graphics.Matrix, android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/PathMeasure.xml b/docs/Mono.Android/en/Android.Graphics/PathMeasure.xml
index 9c45bf4e1e..63b7802f56 100644
--- a/docs/Mono.Android/en/Android.Graphics/PathMeasure.xml
+++ b/docs/Mono.Android/en/Android.Graphics/PathMeasure.xml
@@ -83,13 +83,15 @@
         <Parameter Name="forceClosed" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="forceClosed">To be added.</param>
-        <summary>Create an empty PathMeasure object.</summary>
+        <param name="path">The path that will be measured by this object</param>
+        <param name="forceClosed">If true, then the path will be considered as "closed"
+                   even if its contour was not explicitly closed.</param>
+        <summary>Create a PathMeasure object associated with the specified path object
+            (already created and specified).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/PathMeasure#PathMeasure()" title="Reference documentation">Java documentation for <code>android.graphics.PathMeasure.PathMeasure()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/PathMeasure#PathMeasure(android.graphics.Path,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.PathMeasure.PathMeasure(android.graphics.Path, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Picture.xml b/docs/Mono.Android/en/Android.Graphics/Picture.xml
index 2a29a7348d..2950ff0111 100644
--- a/docs/Mono.Android/en/Android.Graphics/Picture.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Picture.xml
@@ -90,11 +90,12 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Creates an empty picture that is ready to record.</summary>
+        <summary>Create a picture by making a copy of what has already been recorded in
+            src.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Picture#Picture()" title="Reference documentation">Java documentation for <code>android.graphics.Picture.Picture()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Picture#Picture(android.graphics.Picture)" title="Reference documentation">Java documentation for <code>android.graphics.Picture.Picture(android.graphics.Picture)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/PointF.xml b/docs/Mono.Android/en/Android.Graphics/PointF.xml
index 3c9d055b7f..eabbc368fd 100644
--- a/docs/Mono.Android/en/Android.Graphics/PointF.xml
+++ b/docs/Mono.Android/en/Android.Graphics/PointF.xml
@@ -64,8 +64,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="p">The point whose values are copied into the new
-                     point.</param>
         <summary>Create a new PointF initialized with the values in the specified
             PointF (which is left unmodified).</summary>
         <remarks>
@@ -206,8 +204,6 @@
       <Docs>
         <param name="x">To be added.</param>
         <param name="y">To be added.</param>
-        <param name="p">The point whose values are copied into the new
-                     point.</param>
         <summary>Create a new PointF initialized with the values in the specified
             PointF (which is left unmodified).</summary>
         <remarks>
@@ -436,12 +432,12 @@
       <Docs>
         <param name="x">To be added.</param>
         <param name="y">To be added.</param>
-        <summary>Return the euclidian distance from (0,0) to the point</summary>
+        <summary>Returns the euclidian distance from (0,0) to (x,y)</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/PointF#length()" title="Reference documentation">Java documentation for <code>android.graphics.PointF.length()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/PointF#length(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.PointF.length(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -581,11 +577,11 @@
       </Parameters>
       <Docs>
         <param name="p">To be added.</param>
-        <summary>Set the point's x and y coordinates</summary>
+        <summary>Set the point's x and y coordinates to the coordinates of p</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/PointF#set(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.PointF.set(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/PointF#set(android.graphics.PointF)" title="Reference documentation">Java documentation for <code>android.graphics.PointF.set(android.graphics.PointF)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/RadialGradient.xml b/docs/Mono.Android/en/Android.Graphics/RadialGradient.xml
index 0252406a24..dbdec4c4f3 100644
--- a/docs/Mono.Android/en/Android.Graphics/RadialGradient.xml
+++ b/docs/Mono.Android/en/Android.Graphics/RadialGradient.xml
@@ -82,23 +82,6 @@
         <param name="radius">To be added.</param>
         <param name="centerColor">To be added.</param>
         <param name="edgeColor">To be added.</param>
-        <param name="startX">The x-coordinate of the center of the starting circle of the radial gradient,
-                           often referred to as the focal point.</param>
-        <param name="startY">The y-coordinate of the center of the starting circle of the radial gradient,
-                            often referred to as the focal point.</param>
-        <param name="startRadius">The radius of the starting circle of the radial gradient, often referred
-                               to as the focal radius. Must be greater than or equal to zero.</param>
-        <param name="endX">The x-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endY">The y-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endRadius">The radius of the ending circle for this gradient. This must be strictly
-                               greater than zero. A radius value equal to zero is not allowed.</param>
-        <param name="colors">The colors to be distributed between the center and edge of the circle</param>
-        <param name="stops">May be &lt;code&gt;null&lt;/code&gt;. Valid values are between &lt;code&gt;0.0f&lt;/code&gt; and
-                            &lt;code&gt;1.0f&lt;/code&gt;. The relative position of each corresponding color in
-                            the colors array. If &lt;code&gt;null&lt;/code&gt;, colors are distributed evenly
-                            between the center and edge of the circle.</param>
         <param name="tileMode">The Shader tiling mode</param>
         <summary>Create a shader that draws a radial gradient given the start and end points as well as
             starting and ending radii.</summary>
@@ -145,18 +128,6 @@
         <param name="centerX">To be added.</param>
         <param name="centerY">To be added.</param>
         <param name="radius">To be added.</param>
-        <param name="startX">The x-coordinate of the center of the starting circle of the radial gradient,
-                           often referred to as the focal point.</param>
-        <param name="startY">The y-coordinate of the center of the starting circle of the radial gradient,
-                            often referred to as the focal point.</param>
-        <param name="startRadius">The radius of the starting circle of the radial gradient, often referred
-                               to as the focal radius. Must be greater than or equal to zero.</param>
-        <param name="endX">The x-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endY">The y-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endRadius">The radius of the ending circle for this gradient. This must be strictly
-                               greater than zero. A radius value equal to zero is not allowed.</param>
         <param name="colors">The colors to be distributed between the center and edge of the circle</param>
         <param name="stops">May be &lt;code&gt;null&lt;/code&gt;. Valid values are between &lt;code&gt;0.0f&lt;/code&gt; and
                             &lt;code&gt;1.0f&lt;/code&gt;. The relative position of each corresponding color in
@@ -210,23 +181,6 @@
         <param name="radius">To be added.</param>
         <param name="centerColor">To be added.</param>
         <param name="edgeColor">To be added.</param>
-        <param name="startX">The x-coordinate of the center of the starting circle of the radial gradient,
-                           often referred to as the focal point.</param>
-        <param name="startY">The y-coordinate of the center of the starting circle of the radial gradient,
-                            often referred to as the focal point.</param>
-        <param name="startRadius">The radius of the starting circle of the radial gradient, often referred
-                               to as the focal radius. Must be greater than or equal to zero.</param>
-        <param name="endX">The x-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endY">The y-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endRadius">The radius of the ending circle for this gradient. This must be strictly
-                               greater than zero. A radius value equal to zero is not allowed.</param>
-        <param name="colors">The colors to be distributed between the center and edge of the circle</param>
-        <param name="stops">May be &lt;code&gt;null&lt;/code&gt;. Valid values are between &lt;code&gt;0.0f&lt;/code&gt; and
-                            &lt;code&gt;1.0f&lt;/code&gt;. The relative position of each corresponding color in
-                            the colors array. If &lt;code&gt;null&lt;/code&gt;, colors are distributed evenly
-                            between the center and edge of the circle.</param>
         <param name="tileMode">The Shader tiling mode</param>
         <summary>Create a shader that draws a radial gradient given the start and end points as well as
             starting and ending radii.</summary>
@@ -272,18 +226,6 @@
         <param name="centerX">To be added.</param>
         <param name="centerY">To be added.</param>
         <param name="radius">To be added.</param>
-        <param name="startX">The x-coordinate of the center of the starting circle of the radial gradient,
-                           often referred to as the focal point.</param>
-        <param name="startY">The y-coordinate of the center of the starting circle of the radial gradient,
-                            often referred to as the focal point.</param>
-        <param name="startRadius">The radius of the starting circle of the radial gradient, often referred
-                               to as the focal radius. Must be greater than or equal to zero.</param>
-        <param name="endX">The x-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endY">The y-coordinate of the center of the radius for the end circle of the
-                            radial gradient</param>
-        <param name="endRadius">The radius of the ending circle for this gradient. This must be strictly
-                               greater than zero. A radius value equal to zero is not allowed.</param>
         <param name="colors">The colors to be distributed between the center and edge of the circle</param>
         <param name="stops">May be &lt;code&gt;null&lt;/code&gt;. Valid values are between &lt;code&gt;0.0f&lt;/code&gt; and
                             &lt;code&gt;1.0f&lt;/code&gt;. The relative position of each corresponding color in
diff --git a/docs/Mono.Android/en/Android.Graphics/Rect.xml b/docs/Mono.Android/en/Android.Graphics/Rect.xml
index 463765cec9..0f372c8679 100644
--- a/docs/Mono.Android/en/Android.Graphics/Rect.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Rect.xml
@@ -100,12 +100,14 @@
         <Parameter Name="r" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="r">To be added.</param>
-        <summary>Create a new empty Rect.</summary>
+        <param name="r">The rectangle whose coordinates are copied into the new
+                     rectangle.</param>
+        <summary>Create a new rectangle, initialized with the values in the specified
+            rectangle (which is left unmodified).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Rect#Rect()" title="Reference documentation">Java documentation for <code>android.graphics.Rect.Rect()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Rect#Rect(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.Rect(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -295,11 +297,21 @@
       </Parameters>
       <Docs>
         <param name="r">The rectangle being tested for containment.</param>
-        <summary tool="true">Returns true iff the specified rectangle r is inside or equal to this
- rectangle.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns true iff the specified rectangle r is inside or equal to this
+            rectangle.</summary>
+        <returns>true iff the specified rectangle r is inside or equal to this
+                         rectangle</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/Rect#contains(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.contains(android.graphics.Rect)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -369,11 +381,20 @@
         <param name="right">The right side of the rectangle being tested for containment</param>
         <param name="bottom">The bottom of the rectangle being tested for containment</param>
         <summary>Returns true iff the 4 specified sides of a rectangle are inside or equal
- to this rectangle. i.e. is this rectangle a superset of the specified
- rectangle.</summary>
-        <returns>To be added.</returns>
+            to this rectangle.</summary>
+        <returns>true iff the the 4 specified sides of a rectangle are inside or
+                         equal to this rectangle</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/Rect#contains(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.contains(int, int, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -617,14 +638,12 @@
         <Parameter Name="insets" Type="Android.Graphics.Insets" />
       </Parameters>
       <Docs>
-        <param name="insets">To be added.</param>
-        <param name="dx">The amount to add(subtract) from the rectangle's left(right)</param>
-        <param name="dy">The amount to add(subtract) from the rectangle's top(bottom)</param>
-        <summary>Inset the rectangle by (dx,dy).</summary>
+        <param name="insets">The insets to inset the rect by.</param>
+        <summary>Insets the rectangle on all sides specified by the dimensions of <c>insets</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Rect#inset(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.inset(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Rect#inset(android.graphics.Insets)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.inset(android.graphics.Insets)</code>.</a>
             </format>
           </para>
           <para>
@@ -703,17 +722,15 @@
         <Parameter Name="bottom" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="left">To be added.</param>
-        <param name="top">To be added.</param>
-        <param name="right">To be added.</param>
-        <param name="bottom">To be added.</param>
-        <param name="dx">The amount to add(subtract) from the rectangle's left(right)</param>
-        <param name="dy">The amount to add(subtract) from the rectangle's top(bottom)</param>
-        <summary>Inset the rectangle by (dx,dy).</summary>
+        <param name="left">The amount to add from the rectangle's left</param>
+        <param name="top">The amount to add from the rectangle's top</param>
+        <param name="right">The amount to subtract from the rectangle's right</param>
+        <param name="bottom">The amount to subtract from the rectangle's bottom</param>
+        <summary>Insets the rectangle on all sides specified by the insets.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Rect#inset(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.inset(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Rect#inset(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.inset(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -748,23 +765,16 @@
       </Parameters>
       <Docs>
         <param name="r">The rectangle being intersected with this rectangle.</param>
-        <param name="left">The left side of the rectangle being intersected with this
-                        rectangle</param>
-        <param name="top">The top of the rectangle being intersected with this rectangle</param>
-        <param name="right">The right side of the rectangle being intersected with this
-                         rectangle.</param>
-        <param name="bottom">The bottom of the rectangle being intersected with this
-                        rectangle.</param>
-        <summary>If the rectangle specified by left,top,right,bottom intersects this
-            rectangle, return true and set this rectangle to that intersection,
-            otherwise return false and do not change this rectangle.</summary>
+        <summary>If the specified rectangle intersects this rectangle, return true and set
+            this rectangle to that intersection, otherwise return false and do not
+            change this rectangle.</summary>
         <returns>true if the specified rectangle and this rectangle intersect
                          (and this rectangle is then set to that intersection) else
                          return false and do not change this rectangle.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Rect#intersect(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.intersect(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Rect#intersect(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.intersect(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -856,18 +866,13 @@
       <Docs>
         <param name="a">The first rectangle being tested for intersection</param>
         <param name="b">The second rectangle being tested for intersection</param>
-        <param name="left">The left side of the rectangle being tested for intersection</param>
-        <param name="top">The top of the rectangle being tested for intersection</param>
-        <param name="right">The right side of the rectangle being tested for
-                         intersection</param>
-        <param name="bottom">The bottom of the rectangle being tested for intersection</param>
-        <summary>Returns true if this rectangle intersects the specified rectangle.</summary>
-        <returns>true iff the specified rectangle intersects this rectangle. In
-                         no event is this rectangle modified.</returns>
+        <summary>Returns true iff the two specified rectangles intersect.</summary>
+        <returns>true iff the two specified rectangles intersect. In no event are
+                         either of the rectangles modified.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Rect#intersects(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.intersects(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Rect#intersects(android.graphics.Rect,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.intersects(android.graphics.Rect, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -1208,11 +1213,19 @@
       </Parameters>
       <Docs>
         <param name="src">The rectangle whose coordinates are copied into this
-           rectangle.
-</param>
-        <summary tool="true">Copy the coordinates from src into this rectangle.</summary>
+                      rectangle.</param>
+        <summary>Copy the coordinates from src into this rectangle.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/Rect#set(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.set(android.graphics.Rect)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -1562,15 +1575,12 @@
         <Parameter Name="r" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="r">The rectangle being unioned with this rectangle
-</param>
-        <param name="x">The x coordinate of the point to add to the rectangle</param>
-        <param name="y">The y coordinate of the point to add to the rectangle</param>
-        <summary>Update this Rect to enclose itself and the [x,y] coordinate.</summary>
+        <param name="r">The rectangle being unioned with this rectangle</param>
+        <summary>Update this Rect to enclose itself and the specified rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Rect#union(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.union(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Rect#union(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.union(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -1653,15 +1663,12 @@
         <param name="left">The left edge being unioned with this rectangle</param>
         <param name="top">The top edge being unioned with this rectangle</param>
         <param name="right">The right edge being unioned with this rectangle</param>
-        <param name="bottom">The bottom edge being unioned with this rectangle
-</param>
-        <param name="x">The x coordinate of the point to add to the rectangle</param>
-        <param name="y">The y coordinate of the point to add to the rectangle</param>
-        <summary>Update this Rect to enclose itself and the [x,y] coordinate.</summary>
+        <param name="bottom">The bottom edge being unioned with this rectangle</param>
+        <summary>Update this Rect to enclose itself and the specified rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Rect#union(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.union(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Rect#union(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Rect.union(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/RectF.xml b/docs/Mono.Android/en/Android.Graphics/RectF.xml
index bdcc162be3..4473219bdf 100644
--- a/docs/Mono.Android/en/Android.Graphics/RectF.xml
+++ b/docs/Mono.Android/en/Android.Graphics/RectF.xml
@@ -133,12 +133,14 @@
         <Parameter Name="r" Type="Android.Graphics.RectF" />
       </Parameters>
       <Docs>
-        <param name="r">To be added.</param>
-        <summary>Create a new empty RectF.</summary>
+        <param name="r">The rectangle whose coordinates are copied into the new
+                     rectangle.</param>
+        <summary>Create a new rectangle, initialized with the values in the specified
+            rectangle (which is left unmodified).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RectF#RectF()" title="Reference documentation">Java documentation for <code>android.graphics.RectF.RectF()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RectF#RectF(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.RectF(android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -329,11 +331,21 @@
       </Parameters>
       <Docs>
         <param name="r">The rectangle being tested for containment.</param>
-        <summary tool="true">Returns true iff the specified rectangle r is inside or equal to this
- rectangle.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns true iff the specified rectangle r is inside or equal to this
+            rectangle.</summary>
+        <returns>true iff the specified rectangle r is inside or equal to this
+                         rectangle</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/RectF#contains(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.contains(android.graphics.RectF)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -403,11 +415,20 @@
         <param name="right">The right side of the rectangle being tested for containment</param>
         <param name="bottom">The bottom of the rectangle being tested for containment</param>
         <summary>Returns true iff the 4 specified sides of a rectangle are inside or equal
- to this rectangle. i.e. is this rectangle a superset of the specified
- rectangle.</summary>
-        <returns>To be added.</returns>
+            to this rectangle.</summary>
+        <returns>true iff the the 4 specified sides of a rectangle are inside or
+                         equal to this rectangle</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/RectF#contains(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.contains(float, float, float, float)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -578,23 +599,16 @@
       </Parameters>
       <Docs>
         <param name="r">The rectangle being intersected with this rectangle.</param>
-        <param name="left">The left side of the rectangle being intersected with this
-                        rectangle</param>
-        <param name="top">The top of the rectangle being intersected with this rectangle</param>
-        <param name="right">The right side of the rectangle being intersected with this
-                         rectangle.</param>
-        <param name="bottom">The bottom of the rectangle being intersected with this
-                        rectangle.</param>
-        <summary>If the rectangle specified by left,top,right,bottom intersects this
-            rectangle, return true and set this rectangle to that intersection,
-            otherwise return false and do not change this rectangle.</summary>
+        <summary>If the specified rectangle intersects this rectangle, return true and set
+            this rectangle to that intersection, otherwise return false and do not
+            change this rectangle.</summary>
         <returns>true if the specified rectangle and this rectangle intersect
                          (and this rectangle is then set to that intersection) else
                          return false and do not change this rectangle.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RectF#intersect(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.intersect(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RectF#intersect(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.intersect(android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -686,18 +700,13 @@
       <Docs>
         <param name="a">The first rectangle being tested for intersection</param>
         <param name="b">The second rectangle being tested for intersection</param>
-        <param name="left">The left side of the rectangle being tested for intersection</param>
-        <param name="top">The top of the rectangle being tested for intersection</param>
-        <param name="right">The right side of the rectangle being tested for
-                         intersection</param>
-        <param name="bottom">The bottom of the rectangle being tested for intersection</param>
-        <summary>Returns true if this rectangle intersects the specified rectangle.</summary>
-        <returns>true iff the specified rectangle intersects this rectangle. In
-                         no event is this rectangle modified.</returns>
+        <summary>Returns true iff the two specified rectangles intersect.</summary>
+        <returns>true iff the two specified rectangles intersect. In no event are
+                         either of the rectangles modified.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RectF#intersects(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.intersects(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RectF#intersects(android.graphics.RectF,%20android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.intersects(android.graphics.RectF, android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -1120,11 +1129,19 @@
       </Parameters>
       <Docs>
         <param name="src">The rectangle whose coordinates are copied into this
-           rectangle.
-</param>
-        <summary tool="true">Copy the coordinates from src into this rectangle.</summary>
+                      rectangle.</param>
+        <summary>Copy the coordinates from src into this rectangle.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/RectF#set(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.set(android.graphics.Rect)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -1153,11 +1170,19 @@
       </Parameters>
       <Docs>
         <param name="src">The rectangle whose coordinates are copied into this
-           rectangle.
-</param>
+                      rectangle.</param>
         <summary>Copy the coordinates from src into this rectangle.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/graphics/RectF#set(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.set(android.graphics.RectF)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -1465,15 +1490,12 @@
         <Parameter Name="r" Type="Android.Graphics.RectF" />
       </Parameters>
       <Docs>
-        <param name="r">The rectangle being unioned with this rectangle
-</param>
-        <param name="x">The x coordinate of the point to add to the rectangle</param>
-        <param name="y">The y coordinate of the point to add to the rectangle</param>
-        <summary>Update this Rect to enclose itself and the [x,y] coordinate.</summary>
+        <param name="r">The rectangle being unioned with this rectangle</param>
+        <summary>Update this Rect to enclose itself and the specified rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RectF#union(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.union(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RectF#union(android.graphics.RectF)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.union(android.graphics.RectF)</code>.</a>
             </format>
           </para>
           <para>
@@ -1556,15 +1578,12 @@
         <param name="left">The left edge being unioned with this rectangle</param>
         <param name="top">The top edge being unioned with this rectangle</param>
         <param name="right">The right edge being unioned with this rectangle</param>
-        <param name="bottom">The bottom edge being unioned with this rectangle
-</param>
-        <param name="x">The x coordinate of the point to add to the rectangle</param>
-        <param name="y">The y coordinate of the point to add to the rectangle</param>
-        <summary>Update this Rect to enclose itself and the [x,y] coordinate.</summary>
+        <param name="bottom">The bottom edge being unioned with this rectangle</param>
+        <summary>Update this Rect to enclose itself and the specified rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RectF#union(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.union(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RectF#union(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.RectF.union(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Region.xml b/docs/Mono.Android/en/Android.Graphics/Region.xml
index 562618ba8d..4dccd51ab6 100644
--- a/docs/Mono.Android/en/Android.Graphics/Region.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Region.xml
@@ -96,11 +96,11 @@
       </Parameters>
       <Docs>
         <param name="r">To be added.</param>
-        <summary>Create an empty region</summary>
+        <summary>Return a region set to the specified rectangle</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#Region()" title="Reference documentation">Java documentation for <code>android.graphics.Region.Region()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#Region(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Region.Region(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -133,11 +133,11 @@
       </Parameters>
       <Docs>
         <param name="region">To be added.</param>
-        <summary>Create an empty region</summary>
+        <summary>Return a copy of the specified region</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#Region()" title="Reference documentation">Java documentation for <code>android.graphics.Region.Region()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#Region(android.graphics.Region)" title="Reference documentation">Java documentation for <code>android.graphics.Region.Region(android.graphics.Region)</code>.</a>
             </format>
           </para>
           <para>
@@ -199,11 +199,11 @@
         <param name="top">To be added.</param>
         <param name="right">To be added.</param>
         <param name="bottom">To be added.</param>
-        <summary>Create an empty region</summary>
+        <summary>Return a region set to the specified rectangle</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#Region()" title="Reference documentation">Java documentation for <code>android.graphics.Region.Region()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#Region(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Region.Region(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -418,12 +418,12 @@
       </Parameters>
       <Docs>
         <param name="path">To be added.</param>
-        <summary>Return the boundary of the region as a new Path.</summary>
+        <summary>Set the path to the boundary of the region.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#getBoundaryPath()" title="Reference documentation">Java documentation for <code>android.graphics.Region.getBoundaryPath()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#getBoundaryPath(android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.graphics.Region.getBoundaryPath(android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -459,12 +459,12 @@
       </Parameters>
       <Docs>
         <param name="r">To be added.</param>
-        <summary>Return a new Rect set to the bounds of the region.</summary>
+        <summary>Set the Rect to the bounds of the region.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#getBounds()" title="Reference documentation">Java documentation for <code>android.graphics.Region.getBounds()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#getBounds(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Region.getBounds(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -876,7 +876,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#quickContains(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Region.quickContains(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#quickContains(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Region.quickContains(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -966,7 +966,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#quickReject(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Region.quickReject(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#quickReject(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Region.quickReject(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -1002,13 +1002,13 @@
       </Parameters>
       <Docs>
         <param name="rgn">To be added.</param>
-        <summary>Return true if the region is empty, or if the specified rectangle does
-            not intersect the region.</summary>
+        <summary>Return true if the region is empty, or if the specified region does not
+            intersect the region.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#quickReject(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Region.quickReject(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#quickReject(android.graphics.Region)" title="Reference documentation">Java documentation for <code>android.graphics.Region.quickReject(android.graphics.Region)</code>.</a>
             </format>
           </para>
           <para>
@@ -1097,7 +1097,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#set(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Region.set(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#set(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.Region.set(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -1133,12 +1133,12 @@
       </Parameters>
       <Docs>
         <param name="region">To be added.</param>
-        <summary>Set the region to the specified rectangle</summary>
+        <summary>Set the region to the specified region.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#set(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Region.set(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#set(android.graphics.Region)" title="Reference documentation">Java documentation for <code>android.graphics.Region.set(android.graphics.Region)</code>.</a>
             </format>
           </para>
           <para>
@@ -1409,11 +1409,11 @@
         <param name="dx">To be added.</param>
         <param name="dy">To be added.</param>
         <param name="dst">To be added.</param>
-        <summary>Translate the region by [dx, dy].</summary>
+        <summary>Set the dst region to the result of translating this region by [dx, dy].</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Region#translate(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Region.translate(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Region#translate(int,%20int,%20android.graphics.Region)" title="Reference documentation">Java documentation for <code>android.graphics.Region.translate(int, int, android.graphics.Region)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml b/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml
index 506cf9fcea..2274b4e3a5 100644
--- a/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml
+++ b/docs/Mono.Android/en/Android.Graphics/RenderEffect.xml
@@ -99,15 +99,18 @@
         <Parameter Name="dst" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="dst">To be added.</param>
         <param name="bitmap">The source bitmap to be rendered by the created <c>RenderEffect</c></param>
+        <param name="src">Optional subset of the bitmap to be part of the rendered output. If null
+                       is provided, the entire bitmap bounds are used.</param>
+        <param name="dst">Bounds of the destination which the bitmap is translated and scaled to be
+                       drawn into within the bounds of the <c>RenderNode</c> this RenderEffect is
+                       installed on</param>
         <summary>Create a <c>RenderEffect</c> that renders the contents of the input <c>Bitmap</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RenderEffect#createBitmapEffect(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.graphics.RenderEffect.createBitmapEffect(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RenderEffect#createBitmapEffect(android.graphics.Bitmap,%20android.graphics.Rect,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.RenderEffect.createBitmapEffect(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -191,9 +194,6 @@
       <Docs>
         <param name="radiusX">Radius of blur along the X axis</param>
         <param name="radiusY">Radius of blur along the Y axis</param>
-        <param name="inputEffect">Input RenderEffect that provides the content to be blurred, can be null
-                               to indicate that the drawing commands on the RenderNode are to be
-                               blurred instead of the input RenderEffect</param>
         <param name="edgeTreatment">Policy for how to blur content near edges of the blur kernel</param>
         <summary>Create a <c>RenderEffect</c> that blurs the contents of the optional input RenderEffect
             with the specified radius along the x and y axis.</summary>
@@ -357,15 +357,14 @@
         <Parameter Name="renderEffect" Type="Android.Graphics.RenderEffect" />
       </Parameters>
       <Docs>
-        <param name="renderEffect">To be added.</param>
         <param name="colorFilter">ColorFilter applied to the content in the input RenderEffect</param>
-        <summary>Create a <c>RenderEffect</c> that applies the color filter to the contents of the
-            <c>android.graphics.RenderNode</c> that this RenderEffect is installed on</summary>
+        <param name="renderEffect">Source to be transformed by the specified <c>ColorFilter</c></param>
+        <summary>Create a <c>RenderEffect</c> that applies the color filter to the provided RenderEffect</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RenderEffect#createColorFilterEffect(android.graphics.ColorFilter)" title="Reference documentation">Java documentation for <code>android.graphics.RenderEffect.createColorFilterEffect(android.graphics.ColorFilter)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RenderEffect#createColorFilterEffect(android.graphics.ColorFilter,%20android.graphics.RenderEffect)" title="Reference documentation">Java documentation for <code>android.graphics.RenderEffect.createColorFilterEffect(android.graphics.ColorFilter, android.graphics.RenderEffect)</code>.</a>
             </format>
           </para>
           <para>
@@ -444,16 +443,15 @@
         <Parameter Name="input" Type="Android.Graphics.RenderEffect" />
       </Parameters>
       <Docs>
-        <param name="input">To be added.</param>
         <param name="offsetX">offset along the x axis in pixels</param>
         <param name="offsetY">offset along the y axis in pixels</param>
-        <summary>Create a <c>RenderEffect</c> instance that will offset the drawing content
-            by the provided x and y offset.</summary>
+        <param name="input">target RenderEffect used to render in the offset coordinates.</param>
+        <summary>Create a <c>RenderEffect</c> instance with the provided x and y offset</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RenderEffect#createOffsetEffect(float,%20float)" title="Reference documentation">Java documentation for <code>android.graphics.RenderEffect.createOffsetEffect(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RenderEffect#createOffsetEffect(float,%20float,%20android.graphics.RenderEffect)" title="Reference documentation">Java documentation for <code>android.graphics.RenderEffect.createOffsetEffect(float, float, android.graphics.RenderEffect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/RenderNode.xml b/docs/Mono.Android/en/Android.Graphics/RenderNode.xml
index 64de6b3c0d..c783de766c 100644
--- a/docs/Mono.Android/en/Android.Graphics/RenderNode.xml
+++ b/docs/Mono.Android/en/Android.Graphics/RenderNode.xml
@@ -42,12 +42,13 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="name">The name of the RenderNode, used for debugging purpose. May be null.</param>
+        <summary>Creates a new RenderNode that can be used to record batches of
+            drawing operations, and store / apply render properties when drawn.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RenderNode#RenderNode(long)" title="Reference documentation">Java documentation for <code>android.graphics.RenderNode.RenderNode(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RenderNode#RenderNode(java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.RenderNode.RenderNode(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -193,15 +194,16 @@
         <Parameter Name="height" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="width">To be added.</param>
-        <param name="height">To be added.</param>
-        <summary>Same as <c>#beginRecording(int, int)</c> with the width &amp; height set
-            to the RenderNode's own width &amp; height.</summary>
+        <param name="width">The width of the recording viewport. This will not alter the width of the
+                          RenderNode itself, that must be set with <c>#setPosition(Rect)</c>.</param>
+        <param name="height">The height of the recording viewport. This will not alter the height of the
+                          RenderNode itself, that must be set with <c>#setPosition(Rect)</c>.</param>
+        <summary>Starts recording a display list for the render node.</summary>
         <returns>A canvas to record drawing operations.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RenderNode#beginRecording()" title="Reference documentation">Java documentation for <code>android.graphics.RenderNode.beginRecording()</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RenderNode#beginRecording(int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.RenderNode.beginRecording(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1813,17 +1815,13 @@
         <Parameter Name="position" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="position">To be added.</param>
-        <param name="left">The left position of the RenderNode, in pixels</param>
-        <param name="top">The top position of the RenderNode, in pixels</param>
-        <param name="right">The right position of the RenderNode, in pixels</param>
-        <param name="bottom">The bottom position of the RenderNode, in pixels</param>
+        <param name="position">The position rectangle in pixels</param>
         <summary>Sets the position of the RenderNode.</summary>
         <returns>True if the value changed, false if the new value was the same as the previous value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/RenderNode#setPosition(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.RenderNode.setPosition(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/RenderNode#setPosition(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.graphics.RenderNode.setPosition(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/SurfaceTexture.xml b/docs/Mono.Android/en/Android.Graphics/SurfaceTexture.xml
index c3634e37a4..22b6b33d7e 100644
--- a/docs/Mono.Android/en/Android.Graphics/SurfaceTexture.xml
+++ b/docs/Mono.Android/en/Android.Graphics/SurfaceTexture.xml
@@ -54,13 +54,12 @@
         <Parameter Name="singleBufferMode" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="singleBufferMode">To be added.</param>
-        <param name="texName">the OpenGL texture object name (e.g. generated via glGenTextures)</param>
+        <param name="singleBufferMode">whether the SurfaceTexture will be in single buffered mode.</param>
         <summary>Construct a new SurfaceTexture to stream images to a given OpenGL texture.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/SurfaceTexture#SurfaceTexture(int)" title="Reference documentation">Java documentation for <code>android.graphics.SurfaceTexture.SurfaceTexture(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/SurfaceTexture#SurfaceTexture(boolean)" title="Reference documentation">Java documentation for <code>android.graphics.SurfaceTexture.SurfaceTexture(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -129,13 +128,13 @@
         <Parameter Name="singleBufferMode" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="singleBufferMode">To be added.</param>
         <param name="texName">the OpenGL texture object name (e.g. generated via glGenTextures)</param>
+        <param name="singleBufferMode">whether the SurfaceTexture will be in single buffered mode.</param>
         <summary>Construct a new SurfaceTexture to stream images to a given OpenGL texture.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/SurfaceTexture#SurfaceTexture(int)" title="Reference documentation">Java documentation for <code>android.graphics.SurfaceTexture.SurfaceTexture(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/SurfaceTexture#SurfaceTexture(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.SurfaceTexture.SurfaceTexture(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -558,10 +557,10 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
+        <param name="listener">The listener to use, or null to remove the listener.</param>
         <param name="handler">The handler on which the listener should be invoked, or null
  to use an arbitrary thread.
 </param>
-        <param name="listener">The listener to use, or null to remove the listener.</param>
         <summary>Register a callback to be invoked when a new image frame becomes available to the
             SurfaceTexture.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Graphics/SweepGradient.xml b/docs/Mono.Android/en/Android.Graphics/SweepGradient.xml
index 913c70e2f0..f889ac2572 100644
--- a/docs/Mono.Android/en/Android.Graphics/SweepGradient.xml
+++ b/docs/Mono.Android/en/Android.Graphics/SweepGradient.xml
@@ -118,17 +118,21 @@
         <Parameter Name="positions" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="colors">To be added.</param>
-        <param name="positions">To be added.</param>
         <param name="cx">The x-coordinate of the center</param>
         <param name="cy">The y-coordinate of the center</param>
-        <param name="color0">The sRGB color to use at the start of the sweep</param>
-        <param name="color1">The sRGB color to use at the end of the sweep</param>
+        <param name="colors">The sRGB colors to be distributed between around the center.
+                            There must be at least 2 colors in the array.</param>
+        <param name="positions">May be NULL. The relative position of
+                            each corresponding color in the colors array, beginning
+                            with 0 and ending with 1.0. If the values are not
+                            monotonic, the drawing may produce unexpected results.
+                            If positions is NULL, then the colors are automatically
+                            spaced evenly.</param>
         <summary>A Shader that draws a sweep gradient around a center point.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/SweepGradient#SweepGradient(float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.SweepGradient.SweepGradient(float, float, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/SweepGradient#SweepGradient(float,%20float,%20int[],%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.SweepGradient.SweepGradient(float, float, int[], float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -165,13 +169,13 @@
       <Docs>
         <param name="cx">The x-coordinate of the center</param>
         <param name="cy">The y-coordinate of the center</param>
-        <param name="color0">The sRGB color to use at the start of the sweep</param>
-        <param name="color1">The sRGB color to use at the end of the sweep</param>
+        <param name="color0">The color to use at the start of the sweep</param>
+        <param name="color1">The color to use at the end of the sweep</param>
         <summary>A Shader that draws a sweep gradient around a center point.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/SweepGradient#SweepGradient(float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.SweepGradient.SweepGradient(float, float, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/SweepGradient#SweepGradient(float,%20float,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.graphics.SweepGradient.SweepGradient(float, float, long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -205,17 +209,21 @@
         <Parameter Name="positions" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="colors">To be added.</param>
-        <param name="positions">To be added.</param>
         <param name="cx">The x-coordinate of the center</param>
         <param name="cy">The y-coordinate of the center</param>
-        <param name="color0">The sRGB color to use at the start of the sweep</param>
-        <param name="color1">The sRGB color to use at the end of the sweep</param>
+        <param name="colors">The colors to be distributed between around the center.
+                            There must be at least 2 colors in the array.</param>
+        <param name="positions">May be NULL. The relative position of
+                            each corresponding color in the colors array, beginning
+                            with 0 and ending with 1.0. If the values are not
+                            monotonic, the drawing may produce unexpected results.
+                            If positions is NULL, then the colors are automatically
+                            spaced evenly.</param>
         <summary>A Shader that draws a sweep gradient around a center point.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/SweepGradient#SweepGradient(float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.SweepGradient.SweepGradient(float, float, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/SweepGradient#SweepGradient(float,%20float,%20long[],%20float[])" title="Reference documentation">Java documentation for <code>android.graphics.SweepGradient.SweepGradient(float, float, long[], float[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Graphics/Typeface.xml b/docs/Mono.Android/en/Android.Graphics/Typeface.xml
index 7b664c29b2..ee08619142 100644
--- a/docs/Mono.Android/en/Android.Graphics/Typeface.xml
+++ b/docs/Mono.Android/en/Android.Graphics/Typeface.xml
@@ -142,17 +142,14 @@
       </Parameters>
       <Docs>
         <param name="familyName">May be null. The name of the font family.</param>
-        <param name="family">An existing <c>Typeface</c> object. In case of <c>null</c>, the default
-                          typeface is used instead.</param>
         <param name="style">The style (normal, bold, italic) of the typeface.
                           e.g. NORMAL, BOLD, ITALIC, BOLD_ITALIC</param>
-        <summary>Create a typeface object that best matches the specified existing
-            typeface and the specified Style.</summary>
+        <summary>Create a typeface object given a family name, and option style information.</summary>
         <returns>The best matching typeface.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Typeface#create(android.graphics.Typeface,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Typeface.create(android.graphics.Typeface, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Typeface#create(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Typeface.create(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,19 +186,19 @@
         <Parameter Name="italic" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="weight">To be added.</param>
-        <param name="italic">To be added.</param>
         <param name="family">An existing <c>Typeface</c> object. In case of <c>null</c>, the default
                           typeface is used instead.</param>
-        <param name="style">The style (normal, bold, italic) of the typeface.
-                          e.g. NORMAL, BOLD, ITALIC, BOLD_ITALIC</param>
-        <summary>Create a typeface object that best matches the specified existing
-            typeface and the specified Style.</summary>
-        <returns>The best matching typeface.</returns>
+        <param name="weight">The desired weight to be drawn.</param>
+        <param name="italic">
+          <c>true</c> if italic style is desired to be drawn. Otherwise, <c>false</c></param>
+        <summary>Creates a typeface object that best matches the specified existing typeface and the specified
+            weight and italic style</summary>
+        <returns>A <c>Typeface</c> object for drawing specified weight and italic style. Never
+                    returns <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Typeface#create(android.graphics.Typeface,%20int)" title="Reference documentation">Java documentation for <code>android.graphics.Typeface.create(android.graphics.Typeface, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Typeface#create(android.graphics.Typeface,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.graphics.Typeface.create(android.graphics.Typeface, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -320,13 +317,12 @@
       </Parameters>
       <Docs>
         <param name="path">The full path to the font data.</param>
-        <param name="file">The path to the font data.</param>
         <summary>Create a new typeface from the specified font file.</summary>
         <returns>The new typeface.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/graphics/Typeface#createFromFile(java.io.File)" title="Reference documentation">Java documentation for <code>android.graphics.Typeface.createFromFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/graphics/Typeface#createFromFile(java.lang.String)" title="Reference documentation">Java documentation for <code>android.graphics.Typeface.createFromFile(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricManager.xml b/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricManager.xml
index 1e6b8fb0b8..fd45044623 100644
--- a/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricManager.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricManager.xml
@@ -350,17 +350,22 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="authenticators">To be added.</param>
-        <summary>Determine if biometrics can be used.</summary>
+        <param name="authenticators">bit field consisting of constants defined in <c>Authenticators</c>.
+                                  If multiple authenticators are queried, a logical OR will be applied.
+                                  For example, if <c>Authenticators#DEVICE_CREDENTIAL</c> |
+                                  <c>Authenticators#BIOMETRIC_STRONG</c> is queried and only
+                                  <c>Authenticators#DEVICE_CREDENTIAL</c> is set up, this API will
+                                  return <c>#BIOMETRIC_SUCCESS</c></param>
+        <summary>Determine if any of the provided authenticators can be used.</summary>
         <returns>
-          <c>#BIOMETRIC_ERROR_NONE_ENROLLED</c> if the user does not have any strong
-                biometrics enrolled, or <c>#BIOMETRIC_ERROR_HW_UNAVAILABLE</c> if none are currently
-                supported/enabled. Returns <c>#BIOMETRIC_SUCCESS</c> if a strong biometric can currently
-                be used (enrolled and available).</returns>
+          <c>#BIOMETRIC_ERROR_NONE_ENROLLED</c> if the user does not have any of the
+                requested authenticators enrolled, or <c>#BIOMETRIC_ERROR_HW_UNAVAILABLE</c> if none are
+                currently supported/enabled. Returns <c>#BIOMETRIC_SUCCESS</c> if one of the requested
+                authenticators can currently be used (enrolled and available).</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager#canAuthenticate()" title="Reference documentation">Java documentation for <code>android.hardware.biometrics.BiometricManager.canAuthenticate()</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager#canAuthenticate(int)" title="Reference documentation">Java documentation for <code>android.hardware.biometrics.BiometricManager.canAuthenticate(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricPrompt.xml b/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricPrompt.xml
index bcdf731480..069a37d971 100644
--- a/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricPrompt.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Biometrics/BiometricPrompt.xml
@@ -121,7 +121,6 @@
         <Parameter Name="callback" Type="Android.Hardware.Biometrics.BiometricPrompt+AuthenticationCallback" />
       </Parameters>
       <Docs>
-        <param name="crypto">A cryptographic operation to be unlocked after successful authentication.</param>
         <param name="cancel">An object that can be used to cancel authentication.</param>
         <param name="executor">An executor to handle callback events.</param>
         <param name="callback">An object to receive authentication events.</param>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/ColorSpaceTransform.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/ColorSpaceTransform.xml
index 9fcbb3d4fa..dc8acf6745 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/ColorSpaceTransform.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/ColorSpaceTransform.xml
@@ -53,12 +53,12 @@
         <Parameter Name="elements" Type="Android.Util.Rational[]" />
       </Parameters>
       <Docs>
-        <param name="elements">An array of <c>18</c> elements</param>
-        <summary>Create a new immutable <c>ColorSpaceTransform</c> instance from an <c>int</c> array.</summary>
+        <param name="elements">An array of <c>9</c> elements</param>
+        <summary>Create a new immutable <c>ColorSpaceTransform</c> instance from a <c>Rational</c> array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/ColorSpaceTransform#ColorSpaceTransform(int[])" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.ColorSpaceTransform.ColorSpaceTransform(int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/ColorSpaceTransform#ColorSpaceTransform(android.util.Rational[])" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.ColorSpaceTransform.ColorSpaceTransform(android.util.Rational[])</code>.</a>
             </format>
           </para>
           <para>
@@ -133,14 +133,14 @@
         <Parameter Name="offset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="destination">an array big enough to hold at least <c>18</c> elements after the
+        <param name="destination">an array big enough to hold at least <c>9</c> elements after the
                      <c>offset</c></param>
         <param name="offset">a non-negative offset into the array</param>
         <summary>Copy the <c>Rational</c> elements in row-major order from this matrix into the destination.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/ColorSpaceTransform#copyElements(int[],%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.ColorSpaceTransform.copyElements(int[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/ColorSpaceTransform#copyElements(android.util.Rational[],%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.ColorSpaceTransform.copyElements(android.util.Rational[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/InputConfiguration.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/InputConfiguration.xml
index 4bf3725eda..8b45f78585 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/InputConfiguration.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/InputConfiguration.xml
@@ -62,15 +62,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="multiResolutionInputs">To be added.</param>
-        <param name="width">Width of the input buffers.</param>
-        <param name="height">Height of the input buffers.</param>
+        <param name="multiResolutionInputs">A group of multi-resolution input info for the specified format.</param>
         <param name="format">Format of the input buffers. One of ImageFormat or PixelFormat constants.</param>
-        <summary>Create an input configuration with the width, height, and user-defined format.</summary>
+        <summary>Create an input configuration with the format and a list of multi-resolution input stream
+            info.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration#InputConfiguration(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.InputConfiguration.InputConfiguration(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration#InputConfiguration(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.InputConfiguration.InputConfiguration(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/MeteringRectangle.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/MeteringRectangle.xml
index 99ec9a12c7..13e46b8b59 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/MeteringRectangle.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/MeteringRectangle.xml
@@ -55,18 +55,13 @@
         <Parameter Name="meteringWeight" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="rect">To be added.</param>
-        <param name="x">coordinate &gt;= 0</param>
-        <param name="y">coordinate &gt;= 0</param>
-        <param name="width">width &gt;= 0</param>
-        <param name="height">height &gt;= 0</param>
-        <param name="meteringWeight">weight between [TODO: @value for `#METERING_WEIGHT_MIN`] and
-                   [TODO: @value for `#METERING_WEIGHT_MAX`] inclusively</param>
+        <param name="rect">a non-<c>null</c> rectangle with all x,y,w,h dimensions &gt;= 0</param>
+        <param name="meteringWeight">weight &gt;= 0</param>
         <summary>Create a new metering rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle#MeteringRectangle(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.MeteringRectangle.MeteringRectangle(int, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle#MeteringRectangle(android.graphics.Rect,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.MeteringRectangle.MeteringRectangle(android.graphics.Rect, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -102,19 +97,14 @@
         <Parameter Name="meteringWeight" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="xy">To be added.</param>
-        <param name="dimensions">To be added.</param>
-        <param name="x">coordinate &gt;= 0</param>
-        <param name="y">coordinate &gt;= 0</param>
-        <param name="width">width &gt;= 0</param>
-        <param name="height">height &gt;= 0</param>
-        <param name="meteringWeight">weight between [TODO: @value for `#METERING_WEIGHT_MIN`] and
-                   [TODO: @value for `#METERING_WEIGHT_MAX`] inclusively</param>
+        <param name="xy">a non-<c>null</c><c>Point</c> with both x,y &gt;= 0</param>
+        <param name="dimensions">a non-<c>null</c><c>android.util.Size Size</c> with width, height &gt;= 0</param>
+        <param name="meteringWeight">weight &gt;= 0</param>
         <summary>Create a new metering rectangle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle#MeteringRectangle(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.MeteringRectangle.MeteringRectangle(int, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle#MeteringRectangle(android.graphics.Point,%20android.util.Size,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.MeteringRectangle.MeteringRectangle(android.graphics.Point, android.util.Size, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration.xml
index d8c69a0815..36b571946e 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/OutputConfiguration.xml
@@ -67,14 +67,15 @@
         <Parameter Name="surface" Type="Android.Views.Surface" />
       </Parameters>
       <Docs>
-        <param name="surfaceGroupId">A group ID for this output, used for sharing memory between multiple outputs.</param>
-        <param name="surface">A Surface for camera to output to.</param>
-        <summary>Create a new <c>OutputConfiguration</c> instance with a <c>Surface</c>,
-            with a surface group ID.</summary>
+        <param name="surface">A Surface for camera to output to.
+            
+            &lt;p&gt;This constructor creates a default configuration, with a surface group ID of
+            [TODO: @value for `#SURFACE_GROUP_ID_NONE`].&lt;/p&gt;</param>
+        <summary>Create a new <c>OutputConfiguration</c> instance with a <c>Surface</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration#OutputConfiguration(int,%20android.view.Surface)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.OutputConfiguration.OutputConfiguration(int, android.view.Surface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration#OutputConfiguration(android.view.Surface)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.OutputConfiguration.OutputConfiguration(android.view.Surface)</code>.</a>
             </format>
           </para>
           <para>
@@ -106,16 +107,16 @@
         <Parameter Name="klass" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="surfaceSize">To be added.</param>
-        <param name="klass">To be added.</param>
-        <param name="surfaceGroupId">A group ID for this output, used for sharing memory between multiple outputs.</param>
-        <param name="surface">A Surface for camera to output to.</param>
-        <summary>Create a new <c>OutputConfiguration</c> instance with a <c>Surface</c>,
-            with a surface group ID.</summary>
+        <param name="surfaceSize">Size for the deferred surface.</param>
+        <param name="klass">a non-<c>null</c><c>Class</c> object reference that indicates the source of
+                       this surface. Only <c>android.view.SurfaceHolder SurfaceHolder.class</c> and
+                       <c>android.graphics.SurfaceTexture SurfaceTexture.class</c> are supported.</param>
+        <summary>Create a new <c>OutputConfiguration</c> instance, with desired Surface size and Surface
+            source class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration#OutputConfiguration(int,%20android.view.Surface)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.OutputConfiguration.OutputConfiguration(int, android.view.Surface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration#OutputConfiguration(android.util.Size,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.OutputConfiguration.OutputConfiguration(android.util.Size, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/RecommendedStreamConfigurationMap.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/RecommendedStreamConfigurationMap.xml
index c2fb6dae81..e9cf0934e7 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/RecommendedStreamConfigurationMap.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/RecommendedStreamConfigurationMap.xml
@@ -242,18 +242,16 @@
         <Parameter Name="size" Type="Android.Util.Size" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
-        <param name="format">an image format from <c>ImageFormat</c> or <c>PixelFormat</c></param>
+        <param name="klass">a class which has a non-empty array returned by <c>#getOutputSizes(Class)</c></param>
         <param name="size">an output-compatible size</param>
-        <summary>Get the minimum
-            <c>android.hardware.camera2.CaptureRequest#SENSOR_FRAME_DURATION frame duration</c>
-            for the format/size combination (in nanoseconds).</summary>
+        <summary>Get the minimum <c>CaptureRequest#SENSOR_FRAME_DURATION frame duration</c>
+            for the class/size combination (in nanoseconds).</summary>
         <returns>a minimum frame duration <c>&gt;</c> 0 in nanoseconds, or
                      0 if the minimum frame duration is not available.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#getOutputMinFrameDuration(int,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.getOutputMinFrameDuration(int, android.util.Size)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#getOutputMinFrameDuration(java.lang.Class,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.getOutputMinFrameDuration(java.lang.Class, android.util.Size)</code>.</a>
             </format>
           </para>
           <para>
@@ -343,15 +341,14 @@
         <Parameter Name="klass" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
-        <param name="format">an image format from <c>ImageFormat</c> or <c>PixelFormat</c></param>
-        <summary>Get a list of sizes compatible with the requested image <c>format</c>.</summary>
-        <returns>a non-modifiable set of supported sizes,
-                     or <c>null</c> if the <c>format</c> is not a supported output</returns>
+        <param name="klass">a <c>Class</c> object reference</param>
+        <summary>Get a list of sizes compatible with <c>klass</c> to use as an output.</summary>
+        <returns>a non-modifiable set of supported sizes for <c>ImageFormat#PRIVATE</c> format,
+                     or <c>null</c> if the <c>klass</c> is not a supported output.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#getOutputSizes(int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.getOutputSizes(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#getOutputSizes(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.getOutputSizes(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -438,15 +435,15 @@
         <Parameter Name="size" Type="Android.Util.Size" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
-        <param name="format">an image format from <c>ImageFormat</c> or <c>PixelFormat</c></param>
+        <param name="klass">a class which has a non-empty array returned by <c>#getOutputSizes(Class)</c>.</param>
         <param name="size">an output-compatible size</param>
-        <summary>Get the stall duration for the format/size combination (in nanoseconds).</summary>
-        <returns>a stall duration <c>&gt;=</c> 0 in nanoseconds</returns>
+        <summary>Get the stall duration for the class/size combination (in nanoseconds).</summary>
+        <returns>a minimum frame duration <c>&gt;</c> 0 in nanoseconds, or 0 if the stall duration is
+                    not available.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#getOutputStallDuration(int,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.getOutputStallDuration(int, android.util.Size)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#getOutputStallDuration(java.lang.Class,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.getOutputStallDuration(java.lang.Class, android.util.Size)</code>.</a>
             </format>
           </para>
           <para>
@@ -685,17 +682,15 @@
         <Parameter Name="surface" Type="Android.Views.Surface" />
       </Parameters>
       <Docs>
-        <param name="surface">To be added.</param>
-        <param name="format">an image format from either <c>ImageFormat</c> or <c>PixelFormat</c></param>
-        <summary>Determine whether or not output surfaces with a particular user-defined format can be passed
-            <c>CameraDevice#createCaptureSession createCaptureSession</c>.</summary>
+        <param name="surface">a <c>Surface</c> object reference</param>
+        <summary>Determine whether or not the <c>surface</c> in its current state is suitable to be included
+            in a <c>CameraDevice#createCaptureSession capture session</c> as an output.</summary>
         <returns>
-          <c>true</c> if using a <c>surface</c> with this <c>format</c> will be
-                     supported with <c>CameraDevice#createCaptureSession</c></returns>
+          <c>true</c> if this is supported, <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#isOutputSupportedFor(int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.isOutputSupportedFor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap#isOutputSupportedFor(android.view.Surface)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.RecommendedStreamConfigurationMap.isOutputSupportedFor(android.view.Surface)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/StreamConfigurationMap.xml b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/StreamConfigurationMap.xml
index 498e919cac..3677739a85 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2.Params/StreamConfigurationMap.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2.Params/StreamConfigurationMap.xml
@@ -386,17 +386,17 @@
         <Parameter Name="size" Type="Android.Util.Size" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
-        <param name="format">an image format from <c>ImageFormat</c> or <c>PixelFormat</c></param>
+        <param name="klass">a class which is supported by <c>#isOutputSupportedFor(Class)</c> and has a
+                     non-empty array returned by <c>#getOutputSizes(Class)</c></param>
         <param name="size">an output-compatible size</param>
         <summary>Get the minimum <c>CaptureRequest#SENSOR_FRAME_DURATION frame duration</c>
-            for the format/size combination (in nanoseconds).</summary>
+            for the class/size combination (in nanoseconds).</summary>
         <returns>a minimum frame duration <c>&gt;</c> 0 in nanoseconds, or
                      0 if the minimum frame duration is not available.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#getOutputMinFrameDuration(int,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.getOutputMinFrameDuration(int, android.util.Size)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#getOutputMinFrameDuration(java.lang.Class,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.getOutputMinFrameDuration(java.lang.Class, android.util.Size)</code>.</a>
             </format>
           </para>
           <para>
@@ -484,15 +484,14 @@
         <Parameter Name="klass" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
-        <param name="format">an image format from <c>ImageFormat</c> or <c>PixelFormat</c></param>
-        <summary>Get a list of sizes compatible with the requested image <c>format</c>.</summary>
-        <returns>an array of supported sizes,
-                     or <c>null</c> if the <c>format</c> is not a supported output</returns>
+        <param name="klass">a non-<c>null</c><c>Class</c> object reference</param>
+        <summary>Get a list of sizes compatible with <c>klass</c> to use as an output.</summary>
+        <returns>an array of supported sizes for <c>ImageFormat#PRIVATE</c> format,
+                     or <c>null</c> iff the <c>klass</c> is not a supported output.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#getOutputSizes(int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.getOutputSizes(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#getOutputSizes(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.getOutputSizes(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -575,15 +574,15 @@
         <Parameter Name="size" Type="Android.Util.Size" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
-        <param name="format">an image format from <c>ImageFormat</c> or <c>PixelFormat</c></param>
+        <param name="klass">a class which is supported by <c>#isOutputSupportedFor(Class)</c> and has a
+                     non-empty array returned by <c>#getOutputSizes(Class)</c></param>
         <param name="size">an output-compatible size</param>
-        <summary>Get the stall duration for the format/size combination (in nanoseconds).</summary>
-        <returns>a stall duration <c>&gt;=</c> 0 in nanoseconds</returns>
+        <summary>Get the stall duration for the class/size combination (in nanoseconds).</summary>
+        <returns>a minimum frame duration <c>&gt;=</c> 0 in nanoseconds</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#getOutputStallDuration(int,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.getOutputStallDuration(int, android.util.Size)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#getOutputStallDuration(java.lang.Class,%20android.util.Size)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.getOutputStallDuration(java.lang.Class, android.util.Size)</code>.</a>
             </format>
           </para>
           <para>
@@ -704,17 +703,15 @@
         <Parameter Name="surface" Type="Android.Views.Surface" />
       </Parameters>
       <Docs>
-        <param name="surface">a non-<c>null</c><see cref="T:Android.Views.Surface" /> object reference</param>
-        <param name="format">an image format from either <c>ImageFormat</c> or <c>PixelFormat</c></param>
-        <summary>Determine whether or not output surfaces with a particular user-defined format can be passed
-            <c>CameraDevice#createCaptureSession createCaptureSession</c>.</summary>
+        <param name="surface">a non-<c>null</c><c>Surface</c> object reference</param>
+        <summary>Determine whether or not the <c>surface</c> in its current state is suitable to be included
+            in a <c>CameraDevice#createCaptureSession capture session</c> as an output.</summary>
         <returns>
-          <c>true</c> iff using a <c>surface</c> with this <c>format</c> will be
-                     supported with <c>CameraDevice#createCaptureSession</c></returns>
+          <c>true</c> if this is supported, <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#isOutputSupportedFor(int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.isOutputSupportedFor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#isOutputSupportedFor(android.view.Surface)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.isOutputSupportedFor(android.view.Surface)</code>.</a>
             </format>
           </para>
           <para>
@@ -754,17 +751,15 @@
         <Parameter Name="klass" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
-        <param name="format">an image format from either <c>ImageFormat</c> or <c>PixelFormat</c></param>
-        <summary>Determine whether or not output surfaces with a particular user-defined format can be passed
-            <c>CameraDevice#createCaptureSession createCaptureSession</c>.</summary>
+        <param name="klass">a non-<c>null</c><c>Class</c> object reference</param>
+        <summary>Determine whether or not output streams can be configured with a particular class
+            as a consumer.</summary>
         <returns>
-          <c>true</c> iff using a <c>surface</c> with this <c>format</c> will be
-                     supported with <c>CameraDevice#createCaptureSession</c></returns>
+          <c>true</c> if this class is supported as an output, <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#isOutputSupportedFor(int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.isOutputSupportedFor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap#isOutputSupportedFor(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.params.StreamConfigurationMap.isOutputSupportedFor(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraDevice.xml b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraDevice.xml
index 5f7b731ca9..802f65ee4c 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraDevice.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraDevice.xml
@@ -366,10 +366,10 @@
         <Parameter Name="physicalCameraIdSet" Type="System.Collections.Generic.ICollection&lt;System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="physicalCameraIdSet">To be added.</param>
         <param name="templateType">An enumeration selecting the use case for this request. Not all template
             types are supported on every device. See the documentation for each template type for
             details.</param>
+        <param name="physicalCameraIdSet">To be added.</param>
         <summary>Create a <c>CaptureRequest.Builder</c> for new capture requests,
             initialized with template for a target use case.</summary>
         <returns>a builder for a capture request, initialized with default
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraExtensionCharacteristics.xml b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraExtensionCharacteristics.xml
index 3bd13a2980..0fc56549ba 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraExtensionCharacteristics.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraExtensionCharacteristics.xml
@@ -334,18 +334,17 @@
         <Parameter Name="klass" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="klass">To be added.</param>
         <param name="extension">the extension type</param>
-        <param name="format">device-specific extension output format</param>
-        <summary>Check whether a given extension is available and return the
-            supported output surface resolutions that can be used for high-quality capture
-            requests via <c>CameraExtensionSession#capture</c>.</summary>
-        <returns>non-modifiable list of available sizes or an empty list if the format is not
-            supported.</returns>
+        <param name="klass">a non-<c>null</c><c>Class</c> object reference</param>
+        <summary>Get a list of sizes compatible with <c>klass</c> to use as an output for the
+            repeating request
+            <c>CameraExtensionSession#setRepeatingRequest</c>.</summary>
+        <returns>non-modifiable list of available sizes or an empty list if the Surface output is not
+            supported</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics#getExtensionSupportedSizes(int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.CameraExtensionCharacteristics.getExtensionSupportedSizes(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics#getExtensionSupportedSizes(int,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.CameraExtensionCharacteristics.getExtensionSupportedSizes(int, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraManager.xml b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraManager.xml
index 6ef2387e4d..807c6488d1 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2/CameraManager.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2/CameraManager.xml
@@ -436,8 +436,6 @@
       <Docs>
         <param name="executor">To be added.</param>
         <param name="callback">the new callback to send camera availability notices to</param>
-        <param name="handler">The handler on which the callback should be invoked, or <c>null</c> to use
-                        the current thread's <c>android.os.Looper looper</c>.</param>
         <summary>Register a callback to be notified about camera device availability.</summary>
         <remarks>
           <para>
@@ -521,8 +519,6 @@
       <Docs>
         <param name="executor">To be added.</param>
         <param name="callback">The new callback to send torch mode status to</param>
-        <param name="handler">The handler on which the callback should be invoked, or <c>null</c> to use
-                        the current thread's <c>android.os.Looper looper</c>.</param>
         <summary>Register a callback to be notified about torch mode status.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Camera2/DngCreator.xml b/docs/Mono.Android/en/Android.Hardware.Camera2/DngCreator.xml
index 62a14bb48a..1d921cfd0e 100644
--- a/docs/Mono.Android/en/Android.Hardware.Camera2/DngCreator.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Camera2/DngCreator.xml
@@ -382,13 +382,14 @@
         <Parameter Name="pixels" Type="Android.Media.Image" />
       </Parameters>
       <Docs>
-        <param name="pixels">a <c>android.graphics.Bitmap</c> of pixel data.</param>
+        <param name="pixels">an <c>android.media.Image</c> object with the format
+                          <c>android.graphics.ImageFormat#YUV_420_888</c>.</param>
         <summary>Set the thumbnail image.</summary>
         <returns>this <c>#DngCreator</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/DngCreator#setThumbnail(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.DngCreator.setThumbnail(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/DngCreator#setThumbnail(android.media.Image)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.DngCreator.setThumbnail(android.media.Image)</code>.</a>
             </format>
           </para>
           <para>
@@ -490,16 +491,17 @@
         <Parameter Name="offset" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="dngOutput">an <see cref="T:Java.IO.OutputStream" /> to write the DNG file to.</param>
-        <param name="size">the <see cref="T:Android.Util.Size" /> of the image to write, in pixels.</param>
-        <param name="pixels">an <see cref="T:Java.Nio.ByteBuffer" /> of pixel data to write.</param>
+        <param name="dngOutput">an <c>java.io.OutputStream</c> to write the DNG file to.</param>
+        <param name="size">the <c>Size</c> of the image to write, in pixels.</param>
+        <param name="pixels">an <c>java.nio.ByteBuffer</c> of pixel data to write.</param>
         <param name="offset">the offset of the raw image in bytes.  This indicates how many bytes will
-               be skipped in the input before any pixel data is read.</param>
-        <summary>Offset, rowStride, and pixelStride are given in bytes.</summary>
+                          be skipped in the input before any pixel data is read.</param>
+        <summary>Write the <c>android.graphics.ImageFormat#RAW_SENSOR</c> pixel data to a DNG file with
+            the currently configured metadata.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/camera2/DngCreator#writeByteBuffer(int,%20int,%20java.nio.ByteBuffer,%20java.io.OutputStream,%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.DngCreator.writeByteBuffer(int, int, java.nio.ByteBuffer, java.io.OutputStream, int, int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/camera2/DngCreator#writeByteBuffer(java.io.OutputStream,%20android.util.Size,%20java.nio.ByteBuffer,%20long)" title="Reference documentation">Java documentation for <code>android.hardware.camera2.DngCreator.writeByteBuffer(java.io.OutputStream, android.util.Size, java.nio.ByteBuffer, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Display/DisplayManager.xml b/docs/Mono.Android/en/Android.Hardware.Display/DisplayManager.xml
index 43e6d02fdb..ff2319ad6e 100644
--- a/docs/Mono.Android/en/Android.Hardware.Display/DisplayManager.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Display/DisplayManager.xml
@@ -78,7 +78,16 @@
         <summary>Creates a virtual display.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/hardware/display/DisplayManager#createVirtualDisplay(java.lang.String,%20int,%20int,%20int,%20android.view.Surface,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.display.DisplayManager.createVirtualDisplay(java.lang.String, int, int, int, android.view.Surface, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <altmember cref="M:Android.Hardware.Display.DisplayManager.CreateVirtualDisplay(System.String, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)" />
       </Docs>
@@ -285,12 +294,12 @@
       </Parameters>
       <Docs>
         <param name="category">The requested display category or null to return all displays.</param>
-        <summary>Gets all currently valid logical displays.</summary>
-        <returns>An array containing all displays.</returns>
+        <summary>Gets all currently valid logical displays of the specified category.</summary>
+        <returns>An array containing all displays sorted by order of preference.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/display/DisplayManager#getDisplays()" title="Reference documentation">Java documentation for <code>android.hardware.display.DisplayManager.getDisplays()</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/display/DisplayManager#getDisplays(java.lang.String)" title="Reference documentation">Java documentation for <code>android.hardware.display.DisplayManager.getDisplays(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbDeviceConnection.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbDeviceConnection.xml
index 3fdfc81cf4..4510c40764 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbDeviceConnection.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbDeviceConnection.xml
@@ -136,10 +136,9 @@
         <Parameter Name="timeout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the index of the first byte in the buffer to send or receive</param>
         <param name="endpoint">the endpoint for this transaction</param>
-        <param name="buffer">buffer for data to send or receive; can be <c>null</c> to wait for next
-                          transaction without reading data</param>
+        <param name="buffer">buffer for data to send or receive</param>
+        <param name="offset">the index of the first byte in the buffer to send or receive</param>
         <param name="length">the length of the data to send or receive. Before
                           [TODO: @value for `Build.VERSION_CODES#P`], a value larger than 16384 bytes
                           would be truncated down to 16384. In API [TODO: @value for `Build.VERSION_CODES#P`]
@@ -151,7 +150,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection#bulkTransfer(android.hardware.usb.UsbEndpoint,%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbDeviceConnection.bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection#bulkTransfer(android.hardware.usb.UsbEndpoint,%20byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbDeviceConnection.bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -406,13 +405,13 @@
         <Parameter Name="timeout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the index of the first byte in the buffer to send or receive</param>
         <param name="requestType">request type for this transaction</param>
         <param name="request">request ID for this transaction</param>
         <param name="value">value field for this transaction</param>
         <param name="index">index field for this transaction</param>
         <param name="buffer">buffer for data portion of transaction,
             or null if no data needs to be sent or received</param>
+        <param name="offset">the index of the first byte in the buffer to send or receive</param>
         <param name="length">the length of the data to send or receive</param>
         <param name="timeout">in milliseconds</param>
         <summary>Performs a control transaction on endpoint zero for this device.</summary>
@@ -421,7 +420,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection#controlTransfer(int,%20int,%20int,%20int,%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbDeviceConnection.controlTransfer(int, int, int, int, byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection#controlTransfer(int,%20int,%20int,%20int,%20byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbDeviceConnection.controlTransfer(int, int, int, int, byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -732,13 +731,13 @@
         <Parameter Name="timeout" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
+        <param name="timeout">timeout in milliseconds. If 0 this method does not wait.</param>
         <summary>Waits for the result of a <c>android.hardware.usb.UsbRequest#queue</c> operation</summary>
-        <returns>a completed USB request, or null if an error occurred</returns>
+        <returns>a completed USB request, or <c>null</c> if an error occurred</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection#requestWait()" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbDeviceConnection.requestWait()</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection#requestWait(long)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbDeviceConnection.requestWait(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbManager.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbManager.xml
index 1a0283c3f2..ab87a2f616 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbManager.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbManager.xml
@@ -456,13 +456,12 @@
       </Parameters>
       <Docs>
         <param name="device">to check permissions for</param>
-        <param name="accessory">to check permissions for</param>
-        <summary>Returns true if the caller has permission to access the accessory.</summary>
+        <summary>Returns true if the caller has permission to access the device.</summary>
         <returns>true if caller has permission</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/usb/UsbManager#hasPermission(android.hardware.usb.UsbAccessory)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbManager.hasPermission(android.hardware.usb.UsbAccessory)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/usb/UsbManager#hasPermission(android.hardware.usb.UsbDevice)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbManager.hasPermission(android.hardware.usb.UsbDevice)</code>.</a>
             </format>
           </para>
           <para>
@@ -655,13 +654,12 @@
       </Parameters>
       <Docs>
         <param name="device">to request permissions for</param>
-        <param name="accessory">to request permissions for</param>
         <param name="pi">PendingIntent for returning result</param>
-        <summary>Requests temporary permission for the given package to access the accessory.</summary>
+        <summary>Requests temporary permission for the given package to access the device.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/usb/UsbManager#requestPermission(android.hardware.usb.UsbAccessory,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbManager.requestPermission(android.hardware.usb.UsbAccessory, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/usb/UsbManager#requestPermission(android.hardware.usb.UsbDevice,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbManager.requestPermission(android.hardware.usb.UsbDevice, android.app.PendingIntent)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware.Usb/UsbRequest.xml b/docs/Mono.Android/en/Android.Hardware.Usb/UsbRequest.xml
index 8e285d6204..c236e2d16a 100644
--- a/docs/Mono.Android/en/Android.Hardware.Usb/UsbRequest.xml
+++ b/docs/Mono.Android/en/Android.Hardware.Usb/UsbRequest.xml
@@ -392,21 +392,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">number of bytes to read or write</param>
-        <param name="buffer">the buffer containing the bytes to send, or the buffer to fill. The state
-                          of the buffer is undefined until the request is returned by
-                          <c>UsbDeviceConnection#requestWait</c>. If the request failed the buffer
-                          will be unchanged; if the request succeeded the position of the buffer is
-                          incremented by the number of bytes sent/received. Before
-                          [TODO: @value for `Build.VERSION_CODES#P`], a buffer of length larger than 16384 bytes
-                          would throw IllegalArgumentException. In API [TODO: @value for `Build.VERSION_CODES#P`]
-                          and after, any size buffer is valid.</param>
+        <param name="buffer">the buffer containing the bytes to write, or location to store the results of a
+                          read. Position and array offset will be ignored and assumed to be 0. Limit and
+                          capacity will be ignored. Once the request
+                          <c>UsbDeviceConnection#requestWait() is processed</c> the position will be set
+                          to the number of bytes read/written.</param>
+        <param name="length">number of bytes to read or write. Before [TODO: @value for `Build.VERSION_CODES#P`], a
+                          value larger than 16384 bytes would be truncated down to 16384. In API
+                          [TODO: @value for `Build.VERSION_CODES#P`] and after, any value of length is valid.</param>
         <summary>Queues the request to send or receive data on its endpoint.</summary>
         <returns>true if the queueing operation succeeded</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/usb/UsbRequest#queue(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbRequest.queue(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/usb/UsbRequest#queue(java.nio.ByteBuffer,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.usb.UsbRequest.queue(java.nio.ByteBuffer, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware/Camera.xml b/docs/Mono.Android/en/Android.Hardware/Camera.xml
index ec9c11ecac..3cd8b8f2e6 100644
--- a/docs/Mono.Android/en/Android.Hardware/Camera.xml
+++ b/docs/Mono.Android/en/Android.Hardware/Camera.xml
@@ -629,15 +629,13 @@
       </Parameters>
       <Docs>
         <param name="cameraId">the hardware camera to access, between 0 and
-     <see cref="P:Android.Hardware.Camera.NumberOfCameras" />-1.</param>
-        <summary>Creates a new Camera object to access the first back-facing camera on the
-            device.</summary>
-        <returns>a new Camera object for the first back-facing camera, or null if there is no
-             backfacing camera</returns>
+                <c>#getNumberOfCameras()</c>-1.</param>
+        <summary>Creates a new Camera object to access a particular hardware camera.</summary>
+        <returns>a new Camera object, connected, locked and ready for use.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/Camera#open()" title="Reference documentation">Java documentation for <code>android.hardware.Camera.open()</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/Camera#open(int)" title="Reference documentation">Java documentation for <code>android.hardware.Camera.open(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Hardware/SensorManager.xml b/docs/Mono.Android/en/Android.Hardware/SensorManager.xml
index 805e5175f6..99f6539fa7 100644
--- a/docs/Mono.Android/en/Android.Hardware/SensorManager.xml
+++ b/docs/Mono.Android/en/Android.Hardware/SensorManager.xml
@@ -166,13 +166,13 @@
         <Parameter Name="mem" Type="Android.OS.MemoryFile" />
       </Parameters>
       <Docs>
-        <param name="mem">A <c>android.hardware.HardwareBuffer</c> shared memory object.</param>
-        <summary>Create a sensor direct channel backed by shared memory wrapped in HardwareBuffer object.</summary>
+        <param name="mem">A <c>android.os.MemoryFile</c> shared memory object.</param>
+        <summary>Create a sensor direct channel backed by shared memory wrapped in MemoryFile object.</summary>
         <returns>A <c>android.hardware.SensorDirectChannel</c> object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#createDirectChannel(android.hardware.HardwareBuffer)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.createDirectChannel(android.hardware.HardwareBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#createDirectChannel(android.os.MemoryFile)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.createDirectChannel(android.os.MemoryFile)</code>.</a>
             </format>
           </para>
           <para>
@@ -426,15 +426,15 @@
         <Parameter Name="wakeUp" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="type">type of sensor requested</param>
         <param name="wakeUp">flag to indicate whether the Sensor is a wake-up or non wake-up sensor.</param>
-        <param name="type">of sensors requested</param>
-        <summary>Use this method to get the default sensor for a given type.</summary>
-        <returns>the default sensor matching the requested type if one exists and the application
-                    has the necessary permissions, or null otherwise.</returns>
+        <summary>Return a Sensor with the given type and wakeUp properties.</summary>
+        <returns>the default sensor matching the requested type and wakeUp properties if one exists
+                    and the application has the necessary permissions, or null otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#getDefaultSensor(int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.getDefaultSensor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#getDefaultSensor(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.getDefaultSensor(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1813,11 +1813,11 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">An object that implements the
                    <c>android.hardware.SensorManager.DynamicSensorCallback
                    DynamicSensorCallback</c>
                    interface for receiving callbacks.</param>
+        <param name="handler">To be added.</param>
         <summary>Add a <c>android.hardware.SensorManager.DynamicSensorCallback
             DynamicSensorCallback</c> to receive dynamic sensor connection callbacks.</summary>
         <remarks>
@@ -1862,24 +1862,15 @@
         <Parameter Name="sensors" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="listener">sensor listener object</param>
         <param name="sensors">a bit masks of the sensors to register to</param>
-        <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object.</param>
-        <param name="sensor">The <c>android.hardware.Sensor Sensor</c> to register to.</param>
-        <param name="samplingPeriodUs">The rate <c>android.hardware.SensorEvent sensor events</c> are
-                       delivered at. This is only a hint to the system. Events may be received faster or
-                       slower than the specified rate. Usually events are received faster. The value must
-                       be one of <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
-                       <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c> or, the desired delay
-                       between events in microseconds. Specifying the delay in microseconds only works
-                       from Android 2.3 (API level 9) onwards. For earlier releases, you must use one of
-                       the <c>SENSOR_DELAY_*</c> constants.</param>
-        <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
-            sensor at the given sampling frequency.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
+        <summary>Registers a listener for given sensors.</summary>
+        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully
+                    enabled</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorListener,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorListener, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1992,29 +1983,20 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="listener">sensor listener object</param>
         <param name="sensors">a bit masks of the sensors to register to</param>
         <param name="rate">rate of events. This is only a hint to the system. events may be
-        received faster or slower than the specified rate. Usually events
-        are received faster. The value must be one of
-        <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Hardware SensorManager SENSOR_DELAY_NORMAL';scope=Xamarin" title="Android.Hardware.SensorManager.SENSOR_DELAY_NORMAL">Android.Hardware.SensorManager.SENSOR_DELAY_NORMAL</a></format>, <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Hardware SensorManager SENSOR_DELAY_UI';scope=Xamarin" title="Android.Hardware.SensorManager.SENSOR_DELAY_UI">Android.Hardware.SensorManager.SENSOR_DELAY_UI</a></format>,
-        <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Hardware SensorManager SENSOR_DELAY_GAME';scope=Xamarin" title="Android.Hardware.SensorManager.SENSOR_DELAY_GAME">Android.Hardware.SensorManager.SENSOR_DELAY_GAME</a></format>, or <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Hardware SensorManager SENSOR_DELAY_FASTEST';scope=Xamarin" title="Android.Hardware.SensorManager.SENSOR_DELAY_FASTEST">Android.Hardware.SensorManager.SENSOR_DELAY_FASTEST</a></format>.</param>
-        <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object.</param>
-        <param name="sensor">The <c>android.hardware.Sensor Sensor</c> to register to.</param>
-        <param name="samplingPeriodUs">The rate <c>android.hardware.SensorEvent sensor events</c> are
-                       delivered at. This is only a hint to the system. Events may be received faster or
-                       slower than the specified rate. Usually events are received faster. The value must
-                       be one of <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
-                       <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c> or, the desired delay
-                       between events in microseconds. Specifying the delay in microseconds only works
-                       from Android 2.3 (API level 9) onwards. For earlier releases, you must use one of
-                       the <c>SENSOR_DELAY_*</c> constants.</param>
-        <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
-            sensor at the given sampling frequency.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
+                   received faster or slower than the specified rate. Usually events
+                   are received faster. The value must be one of
+                   <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
+                   <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c>.</param>
+        <summary>Registers a SensorListener for given sensors.</summary>
+        <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully
+                    enabled</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorListener,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorListener, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2059,24 +2041,25 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">The <see cref="T:Android.OS.Handler" /> the <see cref="T:Android.Hardware.SensorEvent" /> will be delivered to.</param>
         <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object.</param>
         <param name="sensor">The <c>android.hardware.Sensor Sensor</c> to register to.</param>
         <param name="samplingPeriodUs">The rate <c>android.hardware.SensorEvent sensor events</c> are
                        delivered at. This is only a hint to the system. Events may be received faster or
                        slower than the specified rate. Usually events are received faster. The value must
                        be one of <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
-                       <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c> or, the desired delay
-                       between events in microseconds. Specifying the delay in microseconds only works
-                       from Android 2.3 (API level 9) onwards. For earlier releases, you must use one of
-                       the <c>SENSOR_DELAY_*</c> constants.</param>
+                       <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c> or, the desired
+                       delay between events in microseconds. Specifying the delay in microseconds only
+                       works from Android 2.3 (API level 9) onwards. For earlier releases, you must use
+                       one of the <c>SENSOR_DELAY_*</c> constants.</param>
+        <param name="handler">The <c>android.os.Handler Handler</c> the <c>android.hardware.SensorEvent
+                       sensor events</c> will be delivered to.</param>
         <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
-            sensor at the given sampling frequency.</summary>
+            sensor.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -2126,24 +2109,29 @@
         <Parameter Name="maxReportLatencyUs" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="maxReportLatencyUs">To be added.</param>
-        <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object.</param>
+        <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object
+                       that will receive the sensor events. If the application is interested in receiving
+                       flush complete notifications, it should register with
+                       <c>android.hardware.SensorEventListener SensorEventListener2</c> instead.</param>
         <param name="sensor">The <c>android.hardware.Sensor Sensor</c> to register to.</param>
-        <param name="samplingPeriodUs">The rate <c>android.hardware.SensorEvent sensor events</c> are
-                       delivered at. This is only a hint to the system. Events may be received faster or
-                       slower than the specified rate. Usually events are received faster. The value must
-                       be one of <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
-                       <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c> or, the desired delay
-                       between events in microseconds. Specifying the delay in microseconds only works
-                       from Android 2.3 (API level 9) onwards. For earlier releases, you must use one of
-                       the <c>SENSOR_DELAY_*</c> constants.</param>
+        <param name="samplingPeriodUs">The desired delay between two consecutive events in microseconds.
+                       This is only a hint to the system. Events may be received faster or slower than
+                       the specified rate. Usually events are received faster. Can be one of
+                       <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
+                       <c>#SENSOR_DELAY_GAME</c>, <c>#SENSOR_DELAY_FASTEST</c> or the delay in
+                       microseconds.</param>
+        <param name="maxReportLatencyUs">Maximum time in microseconds that events can be delayed before
+                       being reported to the application. A large value allows reducing the power
+                       consumption associated with the sensor. If maxReportLatencyUs is set to zero,
+                       events are delivered as soon as they are available, which is equivalent to calling
+                       <c>#registerListener(SensorEventListener, Sensor, int)</c>.</param>
         <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
-            sensor at the given sampling frequency.</summary>
+            sensor at the given sampling frequency and the given maximum reporting latency.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2191,25 +2179,31 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="maxReportLatencyUs">To be added.</param>
-        <param name="handler">The <see cref="T:Android.OS.Handler" /> the <see cref="T:Android.Hardware.SensorEvent" /> will be delivered to.</param>
-        <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object.</param>
+        <param name="listener">A <c>android.hardware.SensorEventListener SensorEventListener</c> object
+                       that will receive the sensor events. If the application is interested in receiving
+                       flush complete notifications, it should register with
+                       <c>android.hardware.SensorEventListener SensorEventListener2</c> instead.</param>
         <param name="sensor">The <c>android.hardware.Sensor Sensor</c> to register to.</param>
-        <param name="samplingPeriodUs">The rate <c>android.hardware.SensorEvent sensor events</c> are
-                       delivered at. This is only a hint to the system. Events may be received faster or
-                       slower than the specified rate. Usually events are received faster. The value must
-                       be one of <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
-                       <c>#SENSOR_DELAY_GAME</c>, or <c>#SENSOR_DELAY_FASTEST</c> or, the desired delay
-                       between events in microseconds. Specifying the delay in microseconds only works
-                       from Android 2.3 (API level 9) onwards. For earlier releases, you must use one of
-                       the <c>SENSOR_DELAY_*</c> constants.</param>
+        <param name="samplingPeriodUs">The desired delay between two consecutive events in microseconds.
+                       This is only a hint to the system. Events may be received faster or slower than
+                       the specified rate. Usually events are received faster. Can be one of
+                       <c>#SENSOR_DELAY_NORMAL</c>, <c>#SENSOR_DELAY_UI</c>,
+                       <c>#SENSOR_DELAY_GAME</c>, <c>#SENSOR_DELAY_FASTEST</c> or the delay in
+                       microseconds.</param>
+        <param name="maxReportLatencyUs">Maximum time in microseconds that events can be delayed before
+                       being reported to the application. A large value allows reducing the power
+                       consumption associated with the sensor. If maxReportLatencyUs is set to zero,
+                       events are delivered as soon as they are available, which is equivalent to calling
+                       <c>#registerListener(SensorEventListener, Sensor, int)</c>.</param>
+        <param name="handler">The <c>android.os.Handler Handler</c> the <c>android.hardware.SensorEvent
+                       sensor events</c> will be delivered to.</param>
         <summary>Registers a <c>android.hardware.SensorEventListener SensorEventListener</c> for the given
-            sensor at the given sampling frequency.</summary>
+            sensor at the given sampling frequency and the given maximum reporting latency.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if the sensor is supported and successfully enabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#registerListener(android.hardware.SensorEventListener,%20android.hardware.Sensor,%20int,%20int,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, int, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -2595,7 +2589,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#unregisterListener(android.hardware.SensorEventListener)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.unregisterListener(android.hardware.SensorEventListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#unregisterListener(android.hardware.SensorListener)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.unregisterListener(android.hardware.SensorListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -2631,13 +2625,13 @@
         <Parameter Name="sensor" Type="Android.Hardware.Sensor" />
       </Parameters>
       <Docs>
+        <param name="listener">a SensorEventListener object</param>
         <param name="sensor">the sensor to unregister from</param>
-        <param name="listener">a SensorListener object</param>
-        <summary>Unregisters a listener for all sensors.</summary>
+        <summary>Unregisters a listener for the sensors with which it is registered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#unregisterListener(android.hardware.SensorEventListener)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.unregisterListener(android.hardware.SensorEventListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#unregisterListener(android.hardware.SensorEventListener,%20android.hardware.Sensor)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor)</code>.</a>
             </format>
           </para>
           <para>
@@ -2681,14 +2675,13 @@
         <Parameter Name="sensors" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sensors">a bit masks of the sensors to unregister from
-</param>
         <param name="listener">a SensorListener object</param>
-        <summary>Unregisters a listener for all sensors.</summary>
+        <param name="sensors">a bit masks of the sensors to unregister from</param>
+        <summary>Unregisters a listener for the sensors with which it is registered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/hardware/SensorManager#unregisterListener(android.hardware.SensorEventListener)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.unregisterListener(android.hardware.SensorEventListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/hardware/SensorManager#unregisterListener(android.hardware.SensorListener,%20int)" title="Reference documentation">Java documentation for <code>android.hardware.SensorManager.unregisterListener(android.hardware.SensorListener, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.InputMethodServices/InputMethodService.xml b/docs/Mono.Android/en/Android.InputMethodServices/InputMethodService.xml
index 32d8377dff..60b57eada9 100644
--- a/docs/Mono.Android/en/Android.InputMethodServices/InputMethodService.xml
+++ b/docs/Mono.Android/en/Android.InputMethodServices/InputMethodService.xml
@@ -3122,13 +3122,13 @@
         <Parameter Name="subtype" Type="Android.Views.InputMethods.InputMethodSubtype" />
       </Parameters>
       <Docs>
-        <param name="subtype">To be added.</param>
         <param name="id">Unique identifier of the new input method to start.</param>
-        <summary>Force switch to a new input method, as identified by &lt;var&gt;id&lt;/var&gt;.</summary>
+        <param name="subtype">The new subtype of the new input method to be switched to.</param>
+        <summary>Force switch to a new input method, as identified by <c>id</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService#switchInputMethod(java.lang.String)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.InputMethodService.switchInputMethod(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService#switchInputMethod(java.lang.String,%20android.view.inputmethod.InputMethodSubtype)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.InputMethodService.switchInputMethod(java.lang.String, android.view.inputmethod.InputMethodSubtype)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.InputMethodServices/Keyboard.xml b/docs/Mono.Android/en/Android.InputMethodServices/Keyboard.xml
index 429997042f..5e17c30d9c 100644
--- a/docs/Mono.Android/en/Android.InputMethodServices/Keyboard.xml
+++ b/docs/Mono.Android/en/Android.InputMethodServices/Keyboard.xml
@@ -130,14 +130,14 @@
         <Parameter Name="modeId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="modeId">To be added.</param>
         <param name="context">the application or service context</param>
         <param name="xmlLayoutResId">the resource file that contains the keyboard layout and keys.</param>
+        <param name="modeId">keyboard mode identifier</param>
         <summary>Creates a keyboard from the given xml key layout file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/inputmethodservice/Keyboard#Keyboard(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.Keyboard.Keyboard(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/inputmethodservice/Keyboard#Keyboard(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.Keyboard.Keyboard(android.content.Context, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -177,17 +177,20 @@
         <Parameter Name="horizontalPadding" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="layoutTemplateResId">To be added.</param>
-        <param name="characters">To be added.</param>
-        <param name="columns">To be added.</param>
         <param name="horizontalPadding">To be added.</param>
         <param name="context">the application or service context</param>
-        <param name="xmlLayoutResId">the resource file that contains the keyboard layout and keys.</param>
-        <summary>Creates a keyboard from the given xml key layout file.</summary>
+        <param name="layoutTemplateResId">the layout template file, containing no keys.</param>
+        <param name="characters">the list of characters to display on the keyboard. One key will be created
+            for each character.</param>
+        <param name="columns">the number of columns of keys to display. If this number is greater than the 
+            number of keys that can fit in a row, it will be ignored. If this number is -1, the 
+            keyboard will fit as many keys as possible in each row.</param>
+        <summary>Creates a blank keyboard from the given resource file and populates it with the specified
+            characters in left-to-right, top-to-bottom fashion, using the specified number of columns.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/inputmethodservice/Keyboard#Keyboard(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.Keyboard.Keyboard(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/inputmethodservice/Keyboard#Keyboard(android.content.Context,%20int,%20java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.Keyboard.Keyboard(android.content.Context, int, java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -227,16 +230,16 @@
         <Parameter Name="height" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="modeId">To be added.</param>
-        <param name="width">To be added.</param>
-        <param name="height">To be added.</param>
         <param name="context">the application or service context</param>
         <param name="xmlLayoutResId">the resource file that contains the keyboard layout and keys.</param>
+        <param name="modeId">keyboard mode identifier</param>
+        <param name="width">sets width of keyboard</param>
+        <param name="height">sets height of keyboard</param>
         <summary>Creates a keyboard from the given xml key layout file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/inputmethodservice/Keyboard#Keyboard(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.Keyboard.Keyboard(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/inputmethodservice/Keyboard#Keyboard(android.content.Context,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.inputmethodservice.Keyboard.Keyboard(android.content.Context, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Locations/Criteria.xml b/docs/Mono.Android/en/Android.Locations/Criteria.xml
index 7596bbbccd..47270c9be4 100644
--- a/docs/Mono.Android/en/Android.Locations/Criteria.xml
+++ b/docs/Mono.Android/en/Android.Locations/Criteria.xml
@@ -102,11 +102,11 @@
       </Parameters>
       <Docs>
         <param name="criteria">To be added.</param>
-        <summary>Constructs a new Criteria object.</summary>
+        <summary>Constructs a new Criteria object that is a copy of the given criteria.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/Criteria#Criteria()" title="Reference documentation">Java documentation for <code>android.location.Criteria.Criteria()</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/Criteria#Criteria(android.location.Criteria)" title="Reference documentation">Java documentation for <code>android.location.Criteria.Criteria(android.location.Criteria)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Locations/Geocoder.xml b/docs/Mono.Android/en/Android.Locations/Geocoder.xml
index 190eeba26e..fa1e8fc0a6 100644
--- a/docs/Mono.Android/en/Android.Locations/Geocoder.xml
+++ b/docs/Mono.Android/en/Android.Locations/Geocoder.xml
@@ -93,14 +93,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
         <param name="context">the Context of the calling Activity</param>
+        <param name="locale">the desired Locale for the query results</param>
         <summary>Constructs a Geocoder whose responses will be localized for the
-            default system Locale.</summary>
+            given Locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/Geocoder#Geocoder(android.content.Context)" title="Reference documentation">Java documentation for <code>android.location.Geocoder.Geocoder(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/Geocoder#Geocoder(android.content.Context,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>android.location.Geocoder.Geocoder(android.content.Context, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -275,12 +275,12 @@
         <Parameter Name="upperRightLongitude" Type="System.Double" />
       </Parameters>
       <Docs>
+        <param name="locationName">a user-supplied description of a location</param>
+        <param name="maxResults">max number of addresses to return. Smaller numbers (1 to 5) are recommended</param>
         <param name="lowerLeftLatitude">the latitude of the lower left corner of the bounding box</param>
         <param name="lowerLeftLongitude">the longitude of the lower left corner of the bounding box</param>
         <param name="upperRightLatitude">the latitude of the upper right corner of the bounding box</param>
         <param name="upperRightLongitude">the longitude of the upper right corner of the bounding box</param>
-        <param name="locationName">a user-supplied description of a location</param>
-        <param name="maxResults">max number of results to return. Smaller numbers (1 to 5) are recommended</param>
         <summary>Returns an array of Addresses that attempt to describe the named location, which may be a
             place name such as "Dalvik, Iceland", an address such as "1600 Amphitheatre Parkway, Mountain
             View, CA", an airport code such as "SFO", and so forth.</summary>
@@ -289,7 +289,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/Geocoder#getFromLocationName(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.location.Geocoder.getFromLocationName(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/Geocoder#getFromLocationName(java.lang.String,%20int,%20double,%20double,%20double,%20double)" title="Reference documentation">Java documentation for <code>android.location.Geocoder.getFromLocationName(java.lang.String, int, double, double, double, double)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Locations/Location.xml b/docs/Mono.Android/en/Android.Locations/Location.xml
index fab2510846..d6dd5ecabe 100644
--- a/docs/Mono.Android/en/Android.Locations/Location.xml
+++ b/docs/Mono.Android/en/Android.Locations/Location.xml
@@ -104,12 +104,15 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">To be added.</param>
-        <summary>Construct a new Location object that is copied from an existing one.</summary>
+        <param name="provider">the source that provides the location. It can be of type
+            <c>LocationManager#GPS_PROVIDER</c>, <c>LocationManager#NETWORK_PROVIDER</c>,
+            or <c>LocationManager#PASSIVE_PROVIDER</c>. You can also define your own
+            provider string, in which case an empty string is a valid provider.</param>
+        <summary>Construct a new Location with a named provider.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/Location#Location(android.location.Location)" title="Reference documentation">Java documentation for <code>android.location.Location.Location(android.location.Location)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/Location#Location(java.lang.String)" title="Reference documentation">Java documentation for <code>android.location.Location.Location(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -403,12 +406,14 @@
       </Parameters>
       <Docs>
         <param name="coordinate">To be added.</param>
-        <summary>Converts a coordinate to a String representation.</summary>
+        <summary>Converts a String in one of the formats described by
+            FORMAT_DEGREES, FORMAT_MINUTES, or FORMAT_SECONDS into a
+            double.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/Location#convert(double,%20int)" title="Reference documentation">Java documentation for <code>android.location.Location.convert(double, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/Location#convert(java.lang.String)" title="Reference documentation">Java documentation for <code>android.location.Location.convert(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Locations/LocationManager.xml b/docs/Mono.Android/en/Android.Locations/LocationManager.xml
index eb1f0e40cd..54128ffdbb 100644
--- a/docs/Mono.Android/en/Android.Locations/LocationManager.xml
+++ b/docs/Mono.Android/en/Android.Locations/LocationManager.xml
@@ -225,13 +225,14 @@
         <Parameter Name="listener" Type="Android.Locations.IOnNmeaMessageListener" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
-        <summary>No-op method to keep backward-compatibility.</summary>
-        <returns>To be added.</returns>
+        <param name="listener">the listener to register</param>
+        <summary>Adds an NMEA listener.</summary>
+        <returns>
+          <c>true</c> always</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#addNmeaListener(android.location.NmeaListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addNmeaListener(android.location.NmeaListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#addNmeaListener(android.location.OnNmeaMessageListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addNmeaListener(android.location.OnNmeaMessageListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -270,14 +271,15 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
-        <param name="handler">To be added.</param>
-        <summary>No-op method to keep backward-compatibility.</summary>
-        <returns>To be added.</returns>
+        <param name="listener">the listener to register</param>
+        <param name="handler">the handler that the listener runs on</param>
+        <summary>Adds an NMEA listener.</summary>
+        <returns>
+          <c>true</c> always</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#addNmeaListener(android.location.NmeaListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addNmeaListener(android.location.NmeaListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#addNmeaListener(android.location.OnNmeaMessageListener,%20android.os.Handler)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addNmeaListener(android.location.OnNmeaMessageListener, android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -316,14 +318,15 @@
         <Parameter Name="listener" Type="Android.Locations.IOnNmeaMessageListener" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
-        <param name="listener">To be added.</param>
-        <summary>No-op method to keep backward-compatibility.</summary>
-        <returns>To be added.</returns>
+        <param name="listener">the listener to register</param>
+        <param name="executor">the executor that the listener runs on</param>
+        <summary>Adds an NMEA listener.</summary>
+        <returns>
+          <c>true</c> always</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#addNmeaListener(android.location.NmeaListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addNmeaListener(android.location.NmeaListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#addNmeaListener(java.util.concurrent.Executor,%20android.location.OnNmeaMessageListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addNmeaListener(java.util.concurrent.Executor, android.location.OnNmeaMessageListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -454,14 +457,14 @@
         <Parameter Name="extraAttributionTags" Type="System.Collections.Generic.ICollection&lt;System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="properties">To be added.</param>
-        <param name="extraAttributionTags">To be added.</param>
         <param name="provider">the provider name</param>
+        <param name="properties">the provider properties</param>
+        <param name="extraAttributionTags">additional attribution tags associated with this provider</param>
         <summary>Creates a test location provider and adds it to the set of active providers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#addTestProvider(java.lang.String,%20android.location.provider.ProviderProperties)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addTestProvider(java.lang.String, android.location.provider.ProviderProperties)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#addTestProvider(java.lang.String,%20android.location.provider.ProviderProperties,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addTestProvider(java.lang.String, android.location.provider.ProviderProperties, java.util.Set)</code>.</a>
             </format>
           </para>
           <para>
@@ -532,7 +535,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#addTestProvider(java.lang.String,%20android.location.provider.ProviderProperties)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addTestProvider(java.lang.String, android.location.provider.ProviderProperties)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#addTestProvider(java.lang.String,%20boolean,%20boolean,%20boolean,%20boolean,%20boolean,%20boolean,%20boolean,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -999,12 +1002,23 @@
         <Parameter Name="consumer" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="provider">To be added.</param>
-        <param name="cancellationSignal">To be added.</param>
-        <param name="executor">To be added.</param>
-        <param name="consumer">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
+        <param name="cancellationSignal">an optional signal that allows for cancelling this call</param>
+        <param name="executor">the callback will take place on this <c>Executor</c></param>
+        <param name="consumer">the callback invoked with either a <c>Location</c> or null</param>
+        <summary>Asynchronously returns a single current location fix from the given provider.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/location/LocationManager#getCurrentLocation(java.lang.String,%20android.os.CancellationSignal,%20java.util.concurrent.Executor,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.getCurrentLocation(java.lang.String, android.os.CancellationSignal, java.util.concurrent.Executor, java.util.function.Consumer)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="GetCurrentLocation">
@@ -1034,13 +1048,25 @@
         <Parameter Name="consumer" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="provider">To be added.</param>
-        <param name="locationRequest">To be added.</param>
-        <param name="cancellationSignal">To be added.</param>
-        <param name="executor">To be added.</param>
-        <param name="consumer">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
+        <param name="locationRequest">the location request containing location parameters</param>
+        <param name="cancellationSignal">an optional signal that allows for cancelling this call</param>
+        <param name="executor">the callback will take place on this <c>Executor</c></param>
+        <param name="consumer">the callback invoked with either a <c>Location</c> or null</param>
+        <summary>Asynchronously returns a single current location fix from the given provider based on the
+            given <c>LocationRequest</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/location/LocationManager#getCurrentLocation(java.lang.String,%20android.location.LocationRequest,%20android.os.CancellationSignal,%20java.util.concurrent.Executor,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.getCurrentLocation(java.lang.String, android.location.LocationRequest, android.os.CancellationSignal, java.util.concurrent.Executor, java.util.function.Consumer)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="GetGpsStatus">
@@ -1251,14 +1277,13 @@
         <Parameter Name="enabledOnly" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="criteria">the criteria that providers must match</param>
         <param name="enabledOnly">if true then only enabled providers are included</param>
-        <summary>Returns a list of the names of available location providers that satisfy the given criteria.</summary>
+        <summary>Returns a list of the names of available location providers.</summary>
         <returns>list of provider names</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#getProviders(android.location.Criteria,%20boolean)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.getProviders(android.location.Criteria, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#getProviders(boolean)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.getProviders(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -2321,8 +2346,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">the callback to register</param>
+        <param name="handler">To be added.</param>
         <summary>Registers a GNSS navigation message callback which will run on a binder thread.</summary>
         <returns>
           <c>true</c> always</returns>
@@ -2464,8 +2489,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">the callback to register</param>
+        <param name="handler">To be added.</param>
         <summary>Registers a GNSS status callback.</summary>
         <returns>
           <c>true</c> always</returns>
@@ -2642,12 +2667,12 @@
         <Parameter Name="listener" Type="Android.Locations.IOnNmeaMessageListener" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
-        <summary>No-op method to keep backward-compatibility.</summary>
+        <param name="listener">a <c>OnNmeaMessageListener</c> object to remove</param>
+        <summary>Removes an NMEA listener.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#removeNmeaListener(android.location.NmeaListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.removeNmeaListener(android.location.NmeaListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#removeNmeaListener(android.location.OnNmeaMessageListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.removeNmeaListener(android.location.OnNmeaMessageListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -2812,13 +2837,12 @@
         <Parameter Name="listener" Type="Android.Locations.ILocationListener" />
       </Parameters>
       <Docs>
-        <param name="listener">listener object that no longer needs location updates</param>
-        <param name="pendingIntent">pending intent that no longer needs location updates</param>
-        <summary>Removes location updates for the specified <c>PendingIntent</c>.</summary>
+        <param name="listener">listener that no longer needs location updates</param>
+        <summary>Removes all location updates for the specified <c>LocationListener</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#removeUpdates(android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.removeUpdates(android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#removeUpdates(android.location.LocationListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.removeUpdates(android.location.LocationListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -2901,16 +2925,15 @@
         <Parameter Name="requestCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
         <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
-        <param name="pendingIntent">a pendingIntent registered under the provider</param>
-        <param name="requestCode">an arbitrary integer that will be passed back as the extra value for
-                                 <c>#KEY_FLUSH_COMPLETE</c></param>
+        <param name="listener">a listener registered under the provider</param>
+        <param name="requestCode">an arbitrary integer passed through to
+                               <c>LocationListener#onFlushComplete(int)</c></param>
         <summary>Requests that the given provider flush any batched locations to listeners.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestFlush(java.lang.String,%20android.app.PendingIntent,%20int)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestFlush(java.lang.String, android.app.PendingIntent, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestFlush(java.lang.String,%20android.location.LocationListener,%20int)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestFlush(java.lang.String, android.location.LocationListener, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2946,18 +2969,15 @@
         <Parameter Name="pendingIntent" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="provider">To be added.</param>
-        <param name="locationRequest">To be added.</param>
-        <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
-        <param name="minDistanceM">minimum distance between location updates in meters</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
+        <param name="locationRequest">the location request containing location parameters</param>
         <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <summary>Register for location updates from the specified provider, using a <c>LocationRequest</c>,
+            and callbacks delivered via the provided <c>PendingIntent</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(java.lang.String,%20android.location.LocationRequest,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(java.lang.String, android.location.LocationRequest, android.app.PendingIntent)</code>.</a>
             </format>
           </para>
           <para>
@@ -3049,20 +3069,16 @@
         <Parameter Name="listener" Type="Android.Locations.ILocationListener" />
       </Parameters>
       <Docs>
-        <param name="provider">To be added.</param>
-        <param name="locationRequest">To be added.</param>
-        <param name="executor">To be added.</param>
-        <param name="listener">To be added.</param>
-        <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
-        <param name="minDistanceM">minimum distance between location updates in meters</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
+        <param name="locationRequest">the location request containing location parameters</param>
+        <param name="executor">the executor handling listener callbacks</param>
+        <param name="listener">the listener to receive location updates</param>
+        <summary>Register for location updates from the specified provider, using a <c>LocationRequest</c>,
+            and a callback on the specified <c>Executor</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(java.lang.String,%20android.location.LocationRequest,%20java.util.concurrent.Executor,%20android.location.LocationListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(java.lang.String, android.location.LocationRequest, java.util.concurrent.Executor, android.location.LocationListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -3099,17 +3115,16 @@
         <Parameter Name="pendingIntent" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider with which to register</param>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
         <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
         <param name="minDistanceM">minimum distance between location updates in meters</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
         <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <summary>Register for location updates using the named provider, and callbacks delivered via the
+            provided <c>PendingIntent</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(java.lang.String,%20long,%20float,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(java.lang.String, long, float, android.app.PendingIntent)</code>.</a>
             </format>
           </para>
           <para>
@@ -3152,20 +3167,16 @@
         <Parameter Name="listener" Type="Android.Locations.ILocationListener" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider with which to register</param>
-        <param name="listener">a <see cref="T:Android.Locations.ILocationListener" /> whose
- <see cref="M:Android.Locations.ILocationListener.OnLocationChanged(Android.Locations.Location)" /> method will be called for
- each location update</param>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
         <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
         <param name="minDistanceM">minimum distance between location updates in meters</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <param name="listener">the listener to receive location updates</param>
+        <summary>Register for location updates from the given provider with the given arguments, and a
+            callback on the <c>Looper</c> of the calling thread.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(java.lang.String,%20long,%20float,%20android.location.LocationListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -3214,22 +3225,19 @@
         <Parameter Name="looper" Type="Android.OS.Looper" />
       </Parameters>
       <Docs>
-        <param name="listener">a <see cref="T:Android.Locations.ILocationListener" /> whose
- <see cref="M:Android.Locations.ILocationListener.OnLocationChanged(Android.Locations.Location)" /> method will be called for
- each location update</param>
         <param name="looper">a Looper object whose message queue will be used to
  implement the callback mechanism, or null to make callbacks on the calling
  thread</param>
         <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
         <param name="minDistanceM">minimum distance between location updates in meters</param>
         <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <param name="listener">the listener to receive location updates</param>
+        <summary>Register for location updates using a provider selected through the given Criteria, and a
+            callback on the specified <c>Looper</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.location.LocationListener,%20android.os.Looper)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.location.LocationListener, android.os.Looper)</code>.</a>
             </format>
           </para>
           <para>
@@ -3276,18 +3284,17 @@
         <Parameter Name="listener" Type="Android.Locations.ILocationListener" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
-        <param name="listener">To be added.</param>
         <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
         <param name="minDistanceM">minimum distance between location updates in meters</param>
         <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <param name="executor">the executor handling listener callbacks</param>
+        <param name="listener">the listener to receive location updates</param>
+        <summary>Register for location updates using a provider selected through the given Criteria, and a
+            callback on the specified <c>Executor</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20java.util.concurrent.Executor,%20android.location.LocationListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, java.util.concurrent.Executor, android.location.LocationListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -3325,23 +3332,18 @@
         <Parameter Name="looper" Type="Android.OS.Looper" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider with which to register</param>
-        <param name="listener">a <see cref="T:Android.Locations.ILocationListener" /> whose
- <see cref="M:Android.Locations.ILocationListener.OnLocationChanged(Android.Locations.Location)" /> method will be called for
- each location update</param>
-        <param name="looper">a Looper object whose message queue will be used to
- implement the callback mechanism, or null to make callbacks on the calling
- thread</param>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
         <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
         <param name="minDistanceM">minimum distance between location updates in meters</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <param name="listener">the listener to receive location updates</param>
+        <param name="looper">the looper handling listener callbacks, or null to use the looper of the
+                                calling thread</param>
+        <summary>Register for location updates from the given provider with the given arguments, and a
+            callback on the specified <c>Looper</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(java.lang.String,%20long,%20float,%20android.location.LocationListener,%20android.os.Looper)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener, android.os.Looper)</code>.</a>
             </format>
           </para>
           <para>
@@ -3384,19 +3386,17 @@
         <Parameter Name="listener" Type="Android.Locations.ILocationListener" />
       </Parameters>
       <Docs>
-        <param name="provider">To be added.</param>
-        <param name="executor">To be added.</param>
-        <param name="listener">To be added.</param>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
         <param name="minTimeMs">minimum time interval between location updates in milliseconds</param>
         <param name="minDistanceM">minimum distance between location updates in meters</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for location updates using a provider selected through the given Criteria, and
-            callbacks delivered via the provided <c>PendingIntent</c>.</summary>
+        <param name="executor">the executor handling listener callbacks</param>
+        <param name="listener">the listener to receive location updates</param>
+        <summary>Register for location updates using the named provider, and a callback on
+            the specified <c>Executor</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestLocationUpdates(java.lang.String,%20long,%20float,%20java.util.concurrent.Executor,%20android.location.LocationListener)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestLocationUpdates(java.lang.String, long, float, java.util.concurrent.Executor, android.location.LocationListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -3486,15 +3486,13 @@
         <Parameter Name="pendingIntent" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider with which to register</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location
-                                 updates</param>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
         <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for a single location update using a Criteria and pending intent.</summary>
+        <summary>Register for a single location update using a named provider and pending intent.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestSingleUpdate(android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestSingleUpdate(android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestSingleUpdate(java.lang.String,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestSingleUpdate(java.lang.String, android.app.PendingIntent)</code>.</a>
             </format>
           </para>
           <para>
@@ -3539,20 +3537,15 @@
         <Parameter Name="looper" Type="Android.OS.Looper" />
       </Parameters>
       <Docs>
-        <param name="listener">a <see cref="T:Android.Locations.ILocationListener" /> whose
- <see cref="M:Android.Locations.ILocationListener.OnLocationChanged(Android.Locations.Location)" /> method will be called when
- the location update is available</param>
-        <param name="looper">a Looper object whose message queue will be used to
- implement the callback mechanism, or null to make callbacks on the calling
- thread</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location
-                                 updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for a single location update using a Criteria and pending intent.</summary>
+        <param name="criteria">contains parameters to choose the appropriate provider for location updates</param>
+        <param name="listener">the listener to receive location updates</param>
+        <param name="looper">the looper handling listener callbacks, or null to use the looper of the
+                            calling thread</param>
+        <summary>Register for a single location update using a Criteria and a callback.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestSingleUpdate(android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestSingleUpdate(android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestSingleUpdate(android.location.Criteria,%20android.location.LocationListener,%20android.os.Looper)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestSingleUpdate(android.location.Criteria, android.location.LocationListener, android.os.Looper)</code>.</a>
             </format>
           </para>
           <para>
@@ -3597,21 +3590,15 @@
         <Parameter Name="looper" Type="Android.OS.Looper" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider with which to register</param>
-        <param name="listener">a <see cref="T:Android.Locations.ILocationListener" /> whose
- <see cref="M:Android.Locations.ILocationListener.OnLocationChanged(Android.Locations.Location)" /> method will be called when
- the location update is available</param>
-        <param name="looper">a Looper object whose message queue will be used to
- implement the callback mechanism, or null to make callbacks on the calling
- thread</param>
-        <param name="criteria">contains parameters to choose the appropriate provider for location
-                                 updates</param>
-        <param name="pendingIntent">the pending intent to send location updates</param>
-        <summary>Register for a single location update using a Criteria and pending intent.</summary>
+        <param name="provider">a provider listed by <c>#getAllProviders()</c></param>
+        <param name="listener">the listener to receive location updates</param>
+        <param name="looper">the looper handling listener callbacks, or null to use the looper of the
+                            calling thread</param>
+        <summary>Register for a single location update using the named provider and a callback.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/location/LocationManager#requestSingleUpdate(android.location.Criteria,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestSingleUpdate(android.location.Criteria, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/location/LocationManager#requestSingleUpdate(java.lang.String,%20android.location.LocationListener,%20android.os.Looper)" title="Reference documentation">Java documentation for <code>android.location.LocationManager.requestSingleUpdate(java.lang.String, android.location.LocationListener, android.os.Looper)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.Audiofx/DynamicsProcessing.xml b/docs/Mono.Android/en/Android.Media.Audiofx/DynamicsProcessing.xml
index 7664d42b76..84b820c926 100644
--- a/docs/Mono.Android/en/Android.Media.Audiofx/DynamicsProcessing.xml
+++ b/docs/Mono.Android/en/Android.Media.Audiofx/DynamicsProcessing.xml
@@ -94,9 +94,9 @@
       </Parameters>
       <Docs>
         <param name="priority">To be added.</param>
-        <param name="cfg">To be added.</param>
         <param name="audioSession">system-wide unique audio session identifier. The DynamicsProcessing
             will be attached to the MediaPlayer or AudioTrack in the same audio session.</param>
+        <param name="cfg">To be added.</param>
         <summary>Class constructor.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser.xml b/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser.xml
index d15031d262..5315ad3937 100644
--- a/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser.xml
+++ b/docs/Mono.Android/en/Android.Media.Browse/MediaBrowser.xml
@@ -547,9 +547,9 @@
         <Parameter Name="callback" Type="Android.Media.Browse.MediaBrowser+SubscriptionCallback" />
       </Parameters>
       <Docs>
-        <param name="options">To be added.</param>
         <param name="parentId">The id of the parent media item whose list of children
                        will be subscribed.</param>
+        <param name="options">To be added.</param>
         <param name="callback">The callback to receive the list of children.</param>
         <summary>Queries for information about the media items that are contained within
             the specified id and subscribes to receive updates when they change.</summary>
@@ -693,9 +693,9 @@
         <Parameter Name="callback" Type="Android.Media.Browse.MediaBrowser+SubscriptionCallback" />
       </Parameters>
       <Docs>
-        <param name="callback">To be added.</param>
         <param name="parentId">The id of the parent media item whose list of children
                        will be unsubscribed.</param>
+        <param name="callback">To be added.</param>
         <summary>Unsubscribes for changes to the children of the specified media id.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.Midi/MidiReceiver.xml b/docs/Mono.Android/en/Android.Media.Midi/MidiReceiver.xml
index 707947cee2..83932b28c6 100644
--- a/docs/Mono.Android/en/Android.Media.Midi/MidiReceiver.xml
+++ b/docs/Mono.Android/en/Android.Media.Midi/MidiReceiver.xml
@@ -85,12 +85,12 @@
         <Parameter Name="maxMessageSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="maxMessageSize">To be added.</param>
-        <summary>Default MidiReceiver constructor.</summary>
+        <param name="maxMessageSize">the maximum size of a message this receiver can receive</param>
+        <summary>MidiReceiver constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/midi/MidiReceiver#MidiReceiver()" title="Reference documentation">Java documentation for <code>android.media.midi.MidiReceiver.MidiReceiver()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/midi/MidiReceiver#MidiReceiver(int)" title="Reference documentation">Java documentation for <code>android.media.midi.MidiReceiver.MidiReceiver(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -350,15 +350,15 @@
         <Parameter Name="timestamp" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timestamp">To be added.</param>
         <param name="msg">a byte array containing the MIDI data</param>
         <param name="offset">the offset of the first byte of the data in the array to be sent</param>
         <param name="count">the number of bytes of MIDI data in the array to be sent</param>
-        <summary>Called to send MIDI data to the receiver without a timestamp.</summary>
+        <param name="timestamp">the timestamp of the message, based on <c>java.lang.System#nanoTime</c></param>
+        <summary>Called to send MIDI data to the receiver with a specified timestamp.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/midi/MidiReceiver#send(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.midi.MidiReceiver.send(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/midi/MidiReceiver#send(byte[],%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.media.midi.MidiReceiver.send(byte[], int, int, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.Session/MediaController.xml b/docs/Mono.Android/en/Android.Media.Session/MediaController.xml
index fe28c9b7dd..5a1a733fcc 100644
--- a/docs/Mono.Android/en/Android.Media.Session/MediaController.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/MediaController.xml
@@ -645,10 +645,10 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
+        <param name="callback">The callback object, must not be null.</param>
         <param name="handler">The handler to post updates on. If null the callers thread
             will be used.
 </param>
-        <param name="callback">The callback object, must not be null.</param>
         <summary>Registers a callback to receive updates from the Session.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.Session/MediaSession.xml b/docs/Mono.Android/en/Android.Media.Session/MediaSession.xml
index b79977877c..dc1ba68f78 100644
--- a/docs/Mono.Android/en/Android.Media.Session/MediaSession.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/MediaSession.xml
@@ -94,14 +94,18 @@
         <Parameter Name="sessionInfo" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="sessionInfo">To be added.</param>
         <param name="context">The context to use to create the session.</param>
         <param name="tag">A short name for debugging purposes.</param>
+        <param name="sessionInfo">A bundle for additional information about this session.
+                               Controllers can get this information by calling
+                               <c>MediaController#getSessionInfo()</c>.
+                               An <c>IllegalArgumentException</c> will be thrown if this contains
+                               any non-framework Parcelable objects.</param>
         <summary>Creates a new session.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/session/MediaSession#MediaSession(android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.session.MediaSession.MediaSession(android.content.Context, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/session/MediaSession#MediaSession(android.content.Context,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.media.session.MediaSession.MediaSession(android.content.Context, java.lang.String, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -525,9 +529,9 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
+        <param name="callback">The callback object</param>
         <param name="handler">The handler that events should be posted on.
 </param>
-        <param name="callback">The callback object</param>
         <summary>Set the callback to receive updates for the MediaSession.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.Session/MediaSessionManager.xml b/docs/Mono.Android/en/Android.Media.Session/MediaSessionManager.xml
index 664f816683..e1c95991b6 100644
--- a/docs/Mono.Android/en/Android.Media.Session/MediaSessionManager.xml
+++ b/docs/Mono.Android/en/Android.Media.Session/MediaSessionManager.xml
@@ -170,8 +170,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">The listener to add</param>
+        <param name="handler">To be added.</param>
         <summary>This API is not generally intended for third party application developers.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvContract.xml b/docs/Mono.Android/en/Android.Media.TV/TvContract.xml
index 1ed970ab06..8d598ea6ce 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvContract.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvContract.xml
@@ -271,15 +271,13 @@
         <Parameter Name="channelUri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="channelUri">The URI of the channel whose logo is pointed to.
-</param>
-        <param name="channelId">The ID of the channel whose logo is pointed to.</param>
+        <param name="channelUri">The URI of the channel whose logo is pointed to.</param>
         <summary>Builds a URI that points to a channel logo.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildChannelLogoUri(long)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildChannelLogoUri(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildChannelLogoUri(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildChannelLogoUri(android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -515,14 +513,13 @@
         <Parameter Name="channelUri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="channelUri">To be added.</param>
-        <param name="channelId">The ID of the channel to return preview programs for.</param>
+        <param name="channelUri">The URI of the channel to return preview programs for.</param>
         <summary>Builds a URI that points to all preview programs on a given channel.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildPreviewProgramsUriForChannel(long)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildPreviewProgramsUriForChannel(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildPreviewProgramsUriForChannel(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildPreviewProgramsUriForChannel(android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -636,15 +633,13 @@
         <Parameter Name="channelUri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="channelUri">The URI of the channel to return programs for.
-</param>
-        <param name="channelId">The ID of the channel to return programs for.</param>
+        <param name="channelUri">The URI of the channel to return programs for.</param>
         <summary>Builds a URI that points to all programs on a given channel.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildProgramsUriForChannel(long)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildProgramsUriForChannel(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildProgramsUriForChannel(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildProgramsUriForChannel(android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -722,17 +717,16 @@
       <Docs>
         <param name="channelUri">The URI of the channel to return programs for.</param>
         <param name="startTime">The start time used to filter programs. The returned programs should have
-            <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=TvContract Programs COLUMN_END_TIME_UTC_MILLIS;scope=Xamarin" title="TvContract Programs COLUMN_END_TIME_UTC_MILLIS">TvContract Programs COLUMN_END_TIME_UTC_MILLIS</a></format> that is greater than this time.</param>
+                       <c>Programs#COLUMN_END_TIME_UTC_MILLIS</c> that is greater than this time.</param>
         <param name="endTime">The end time used to filter programs. The returned programs should have
-            <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=TvContract Programs COLUMN_START_TIME_UTC_MILLIS;scope=Xamarin" title="TvContract Programs COLUMN_START_TIME_UTC_MILLIS">TvContract Programs COLUMN_START_TIME_UTC_MILLIS</a></format> that is less than this time.
-</param>
-        <param name="channelId">The ID of the channel to return programs for.</param>
-        <summary>Builds a URI that points to all programs on a given channel.</summary>
+                       <c>Programs#COLUMN_START_TIME_UTC_MILLIS</c> that is less than this time.</param>
+        <summary>Builds a URI that points to programs on a specific channel whose schedules overlap with the
+            given time frame.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildProgramsUriForChannel(long)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildProgramsUriForChannel(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildProgramsUriForChannel(android.net.Uri,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildProgramsUriForChannel(android.net.Uri, long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -768,18 +762,20 @@
         <Parameter Name="endTime" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="startTime">The start time used to filter programs. The returned programs should have
-            <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=TvContract Programs COLUMN_END_TIME_UTC_MILLIS;scope=Xamarin" title="TvContract Programs COLUMN_END_TIME_UTC_MILLIS">TvContract Programs COLUMN_END_TIME_UTC_MILLIS</a></format> that is greater than this time.</param>
-        <param name="endTime">The end time used to filter programs. The returned programs should have
-            <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=TvContract Programs COLUMN_START_TIME_UTC_MILLIS;scope=Xamarin" title="TvContract Programs COLUMN_START_TIME_UTC_MILLIS">TvContract Programs COLUMN_START_TIME_UTC_MILLIS</a></format> that is less than this time.
-</param>
         <param name="channelId">The ID of the channel to return programs for.</param>
-        <summary>Builds a URI that points to all programs on a given channel.</summary>
+        <param name="startTime">The start time used to filter programs. The returned programs will have a
+                       <c>Programs#COLUMN_END_TIME_UTC_MILLIS</c> that is greater than or equal to
+                              <c>startTime</c>.</param>
+        <param name="endTime">The end time used to filter programs. The returned programs will have
+                       <c>Programs#COLUMN_START_TIME_UTC_MILLIS</c> that is less than or equal to
+                       <c>endTime</c>.</param>
+        <summary>Builds a URI that points to programs on a specific channel whose schedules overlap with the
+            given time frame.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildProgramsUriForChannel(long)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildProgramsUriForChannel(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvContract#buildProgramsUriForChannel(long,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.media.tv.TvContract.buildProgramsUriForChannel(long, long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvInputService.xml b/docs/Mono.Android/en/Android.Media.TV/TvInputService.xml
index 7f514e08e4..bbacf7387d 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvInputService.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvInputService.xml
@@ -209,8 +209,8 @@
         <Parameter Name="sessionId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sessionId">To be added.</param>
         <param name="inputId">The ID of the TV input associated with the recording session.</param>
+        <param name="sessionId">To be added.</param>
         <summary>Returns a concrete implementation of <c>RecordingSession</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -291,8 +291,8 @@
         <Parameter Name="sessionId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sessionId">To be added.</param>
         <param name="inputId">The ID of the TV input associated with the session.</param>
+        <param name="sessionId">To be added.</param>
         <summary>Returns a concrete implementation of <c>Session</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvRecordingClient.xml b/docs/Mono.Android/en/Android.Media.TV/TvRecordingClient.xml
index e92c78514e..b02bfd5fc2 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvRecordingClient.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvRecordingClient.xml
@@ -189,12 +189,12 @@
         <Parameter Name="params" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
+        <param name="params">Domain-specific data for this request.</param>
         <summary>Pause TV program recording in the current recording session.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#pauseRecording()" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.pauseRecording()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#pauseRecording(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.pauseRecording(android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -300,12 +300,12 @@
         <Parameter Name="params" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
+        <param name="params">Domain-specific data for this request.</param>
         <summary>Resume TV program recording only in recording pause status in the current recording session.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#resumeRecording()" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.resumeRecording()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#resumeRecording(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.resumeRecording(android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -423,14 +423,16 @@
         <Parameter Name="params" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="programUri">The URI for the TV program to record, built by
                        <c>TvContract#buildProgramUri(long)</c>. Can be <c>null</c>.</param>
+        <param name="params">Domain-specific data for this request. Keys &lt;em&gt;must&lt;/em&gt; be a scoped
+                       name, i.e. prefixed with a package name you own, so that different developers will
+                       not create conflicting keys.</param>
         <summary>Starts TV program recording in the current recording session.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#startRecording(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.startRecording(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#startRecording(android.net.Uri,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.startRecording(android.net.Uri, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -605,14 +607,16 @@
         <Parameter Name="params" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="inputId">The ID of the TV input for the given channel.</param>
         <param name="channelUri">The URI of a channel.</param>
+        <param name="params">Domain-specific data for this tune request. Keys &lt;em&gt;must&lt;/em&gt; be a scoped
+                       name, i.e. prefixed with a package name you own, so that different developers will
+                       not create conflicting keys.</param>
         <summary>Tunes to a given channel for TV program recording.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#tune(java.lang.String,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.tune(java.lang.String, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvRecordingClient#tune(java.lang.String,%20android.net.Uri,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.media.tv.TvRecordingClient.tune(java.lang.String, android.net.Uri, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media.TV/TvView.xml b/docs/Mono.Android/en/Android.Media.TV/TvView.xml
index 4c25538d95..ab18a983ed 100644
--- a/docs/Mono.Android/en/Android.Media.TV/TvView.xml
+++ b/docs/Mono.Android/en/Android.Media.TV/TvView.xml
@@ -1132,14 +1132,16 @@
         <Parameter Name="params" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
-        <param name="inputId">The ID of the TV input for the given channel.</param>
+        <param name="inputId">The ID of TV input for the given channel.</param>
         <param name="channelUri">The URI of a channel.</param>
+        <param name="params">Domain-specific data for this tune request. Keys &lt;em&gt;must&lt;/em&gt; be a scoped
+                       name, i.e. prefixed with a package name you own, so that different developers will
+                       not create conflicting keys.</param>
         <summary>Tunes to a given channel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/tv/TvView#tune(java.lang.String,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.tv.TvView.tune(java.lang.String, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/tv/TvView#tune(java.lang.String,%20android.net.Uri,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.media.tv.TvView.tune(java.lang.String, android.net.Uri, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/AsyncPlayer.xml b/docs/Mono.Android/en/Android.Media/AsyncPlayer.xml
index f09c8b4239..27d8ab58b6 100644
--- a/docs/Mono.Android/en/Android.Media/AsyncPlayer.xml
+++ b/docs/Mono.Android/en/Android.Media/AsyncPlayer.xml
@@ -152,13 +152,11 @@
         <Parameter Name="attributes" Type="Android.Media.AudioAttributes" />
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
         <param name="context">Your application's context.</param>
         <param name="uri">The URI to play.  (see <c>MediaPlayer#setDataSource(Context, Uri)</c>)</param>
         <param name="looping">Whether the audio should loop forever.  
                      (see <c>MediaPlayer#setLooping(boolean)</c>)</param>
-        <param name="stream">the AudioStream to use.
-                     (see <c>MediaPlayer#setAudioStreamType(int)</c>)</param>
+        <param name="attributes">To be added.</param>
         <summary>Start playing the sound.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/AudioManager.xml b/docs/Mono.Android/en/Android.Media/AudioManager.xml
index 3db93288f7..e5f5dd0d0d 100644
--- a/docs/Mono.Android/en/Android.Media/AudioManager.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioManager.xml
@@ -514,7 +514,6 @@
       <Docs>
         <param name="executor">To be added.</param>
         <param name="listener">To be added.</param>
-        <param name="executor&#xA;@param&#xA;@param">listener</param>
         <summary>Adds a listener for being notified of changes to the communication audio device.</summary>
         <remarks>
           <para>
@@ -556,7 +555,6 @@
       <Docs>
         <param name="executor">To be added.</param>
         <param name="listener">To be added.</param>
-        <param name="executor&#xA;@param&#xA;@param">listener</param>
         <summary>Adds a listener to be notified of changes to the audio mode.</summary>
         <remarks>
           <para>
@@ -3723,20 +3721,17 @@
         <Parameter Name="volume" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="effectType">The type of sound effect.</param>
         <param name="volume">Sound effect volume.
- The volume value is a raw scalar so UI controls should be scaled logarithmically.
- If a volume of -1 is specified, the AudioManager.STREAM_MUSIC stream volume minus 3dB will be used.
- NOTE: This version is for applications that have their own
- settings panel for enabling and controlling volume.
-</param>
-        <param name="effectType">The type of sound effect.
-            NOTE: This version uses the UI settings to determine
-            whether sounds are heard or not.</param>
+            The volume value is a raw scalar so UI controls should be scaled logarithmically.
+            If a volume of -1 is specified, the AudioManager.STREAM_MUSIC stream volume minus 3dB will be used.
+            NOTE: This version is for applications that have their own
+            settings panel for enabling and controlling volume.</param>
         <summary>Plays a sound effect (Key clicks, lid open/close.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioManager#playSoundEffect(int)" title="Reference documentation">Java documentation for <code>android.media.AudioManager.playSoundEffect(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioManager#playSoundEffect(int,%20float)" title="Reference documentation">Java documentation for <code>android.media.AudioManager.playSoundEffect(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -4137,15 +4132,15 @@
         <Parameter Name="eventReceiver" Type="Android.Content.ComponentName" />
       </Parameters>
       <Docs>
-        <param name="eventReceiver">target that will receive media button intents.  The PendingIntent
-            will be sent an <c>Intent#ACTION_MEDIA_BUTTON</c> event when a media button action
-            occurs, with <c>Intent#EXTRA_KEY_EVENT</c> added and holding the key code of the
-            media button that was pressed.</param>
+        <param name="eventReceiver">identifier of a <c>android.content.BroadcastReceiver</c>
+                 that will receive the media button intent. This broadcast receiver must be declared
+                 in the application manifest. The package of the component must match that of
+                 the context you're registering from.</param>
         <summary>Register a component to be the sole receiver of MEDIA_BUTTON intents.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioManager#registerMediaButtonEventReceiver(android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.media.AudioManager.registerMediaButtonEventReceiver(android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioManager#registerMediaButtonEventReceiver(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.media.AudioManager.registerMediaButtonEventReceiver(android.content.ComponentName)</code>.</a>
             </format>
           </para>
           <para>
@@ -4422,8 +4417,6 @@
       usecases such as voice memo recording, or speech recognition.
       Use <see cref="F:Android.Media.AudioManager.AudiofocusGain" /> for a focus request of unknown duration such
       as the playback of a song or a video.</param>
-        <param name="focusRequest">a <c>AudioFocusRequest</c> instance used to configure how focus is
-              requested.</param>
         <summary>Request audio focus.</summary>
         <returns>
           <c>#AUDIOFOCUS_REQUEST_FAILED</c>, <c>#AUDIOFOCUS_REQUEST_GRANTED</c>
@@ -5708,13 +5701,13 @@
         <Parameter Name="eventReceiver" Type="Android.Content.ComponentName" />
       </Parameters>
       <Docs>
-        <param name="eventReceiver">same PendingIntent that was registed with
-                 <c>#registerMediaButtonEventReceiver(PendingIntent)</c>.</param>
+        <param name="eventReceiver">identifier of a <c>android.content.BroadcastReceiver</c>
+                 that was registered with <c>#registerMediaButtonEventReceiver(ComponentName)</c>.</param>
         <summary>Unregister the receiver of MEDIA_BUTTON intents.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioManager#unregisterMediaButtonEventReceiver(android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.media.AudioManager.unregisterMediaButtonEventReceiver(android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioManager#unregisterMediaButtonEventReceiver(android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.media.AudioManager.unregisterMediaButtonEventReceiver(android.content.ComponentName)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/AudioRecord.xml b/docs/Mono.Android/en/Android.Media/AudioRecord.xml
index bb7453a82a..d8821bddf5 100644
--- a/docs/Mono.Android/en/Android.Media/AudioRecord.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioRecord.xml
@@ -1091,12 +1091,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="readMode">To be added.</param>
         <param name="audioBuffer">the direct buffer to which the recorded audio data is written.
             Data is written to audioBuffer.position().</param>
         <param name="sizeInBytes">the number of requested bytes. It is recommended but not enforced
                that the number of bytes requested be a multiple of the frame size (sample size in
                bytes multiplied by the channel count).</param>
+        <param name="readMode">one of <c>#READ_BLOCKING</c>, <c>#READ_NON_BLOCKING</c>.
+                &lt;br&gt;With <c>#READ_BLOCKING</c>, the read will block until all the requested data
+                is read.
+                &lt;br&gt;With <c>#READ_NON_BLOCKING</c>, the read will return immediately after
+                reading as much audio data as possible without blocking.</param>
         <summary>Reads audio data from the audio hardware for recording into a direct buffer.</summary>
         <returns>zero or the positive number of bytes that were read, or one of the following
                error codes. The number of bytes will not exceed sizeInBytes and will be truncated to be
@@ -1112,7 +1116,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(java.nio.ByteBuffer,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(java.nio.ByteBuffer, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(java.nio.ByteBuffer,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(java.nio.ByteBuffer, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1150,15 +1154,10 @@
       <Docs>
         <param name="audioData">the array to which the recorded audio data is written.</param>
         <param name="offsetInBytes">index in audioData from which the data is written expressed in bytes.</param>
-        <param name="audioBuffer">the direct buffer to which the recorded audio data is written.
-            Data is written to audioBuffer.position().</param>
-        <param name="sizeInBytes">the number of requested bytes. It is recommended but not enforced
-               that the number of bytes requested be a multiple of the frame size (sample size in
-               bytes multiplied by the channel count).</param>
-        <summary>Reads audio data from the audio hardware for recording into a direct buffer.</summary>
+        <param name="sizeInBytes">the number of requested bytes.</param>
+        <summary>Reads audio data from the audio hardware for recording into a byte array.</summary>
         <returns>zero or the positive number of bytes that were read, or one of the following
-               error codes. The number of bytes will not exceed sizeInBytes and will be truncated to be
-               a multiple of the frame size.
+               error codes. The number of bytes will not exceed sizeInBytes.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the object isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -1170,7 +1169,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(java.nio.ByteBuffer,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(java.nio.ByteBuffer, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1208,17 +1207,14 @@
       </Parameters>
       <Docs>
         <param name="audioData">the array to which the recorded audio data is written.</param>
-        <param name="offsetInShorts">index in audioData from which the data is written expressed in shorts.</param>
-        <param name="sizeInShorts">the number of requested shorts.</param>
-        <param name="audioBuffer">the direct buffer to which the recorded audio data is written.
-            Data is written to audioBuffer.position().</param>
-        <param name="sizeInBytes">the number of requested bytes. It is recommended but not enforced
-               that the number of bytes requested be a multiple of the frame size (sample size in
-               bytes multiplied by the channel count).</param>
-        <summary>Reads audio data from the audio hardware for recording into a direct buffer.</summary>
-        <returns>zero or the positive number of bytes that were read, or one of the following
-               error codes. The number of bytes will not exceed sizeInBytes and will be truncated to be
-               a multiple of the frame size.
+        <param name="offsetInShorts">index in audioData to which the data is written expressed in shorts.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInShorts">the number of requested shorts.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <summary>Reads audio data from the audio hardware for recording into a short array.</summary>
+        <returns>zero or the positive number of shorts that were read, or one of the following
+               error codes. The number of shorts will be a multiple of the channel count not to exceed
+               sizeInShorts.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the object isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -1230,7 +1226,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(java.nio.ByteBuffer,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(java.nio.ByteBuffer, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1275,18 +1271,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="audioData">To be added.</param>
-        <param name="offsetInBytes">To be added.</param>
-        <param name="readMode">To be added.</param>
-        <param name="audioBuffer">the direct buffer to which the recorded audio data is written.
-            Data is written to audioBuffer.position().</param>
-        <param name="sizeInBytes">the number of requested bytes. It is recommended but not enforced
-               that the number of bytes requested be a multiple of the frame size (sample size in
-               bytes multiplied by the channel count).</param>
-        <summary>Reads audio data from the audio hardware for recording into a direct buffer.</summary>
+        <param name="audioData">the array to which the recorded audio data is written.</param>
+        <param name="offsetInBytes">index in audioData to which the data is written expressed in bytes.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInBytes">the number of requested bytes.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="readMode">one of <c>#READ_BLOCKING</c>, <c>#READ_NON_BLOCKING</c>.
+                &lt;br&gt;With <c>#READ_BLOCKING</c>, the read will block until all the requested data
+                is read.
+                &lt;br&gt;With <c>#READ_NON_BLOCKING</c>, the read will return immediately after
+                reading as much audio data as possible without blocking.</param>
+        <summary>Reads audio data from the audio hardware for recording into a byte array.</summary>
         <returns>zero or the positive number of bytes that were read, or one of the following
-               error codes. The number of bytes will not exceed sizeInBytes and will be truncated to be
-               a multiple of the frame size.
+               error codes. The number of bytes will be a multiple of the frame size in bytes
+               not to exceed sizeInBytes.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the object isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -1298,7 +1296,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(java.nio.ByteBuffer,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(java.nio.ByteBuffer, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1342,19 +1340,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="audioData">To be added.</param>
-        <param name="offsetInShorts">To be added.</param>
-        <param name="sizeInShorts">To be added.</param>
-        <param name="readMode">To be added.</param>
-        <param name="audioBuffer">the direct buffer to which the recorded audio data is written.
-            Data is written to audioBuffer.position().</param>
-        <param name="sizeInBytes">the number of requested bytes. It is recommended but not enforced
-               that the number of bytes requested be a multiple of the frame size (sample size in
-               bytes multiplied by the channel count).</param>
-        <summary>Reads audio data from the audio hardware for recording into a direct buffer.</summary>
-        <returns>zero or the positive number of bytes that were read, or one of the following
-               error codes. The number of bytes will not exceed sizeInBytes and will be truncated to be
-               a multiple of the frame size.
+        <param name="audioData">the array to which the recorded audio data is written.</param>
+        <param name="offsetInShorts">index in audioData from which the data is written expressed in shorts.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInShorts">the number of requested shorts.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="readMode">one of <c>#READ_BLOCKING</c>, <c>#READ_NON_BLOCKING</c>.
+                &lt;br&gt;With <c>#READ_BLOCKING</c>, the read will block until all the requested data
+                is read.
+                &lt;br&gt;With <c>#READ_NON_BLOCKING</c>, the read will return immediately after
+                reading as much audio data as possible without blocking.</param>
+        <summary>Reads audio data from the audio hardware for recording into a short array.</summary>
+        <returns>zero or the positive number of shorts that were read, or one of the following
+               error codes. The number of shorts will be a multiple of the channel count not to exceed
+               sizeInShorts.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the object isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -1366,7 +1365,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(java.nio.ByteBuffer,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(java.nio.ByteBuffer, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(short[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(short[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1410,19 +1409,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="audioData">To be added.</param>
-        <param name="offsetInFloats">To be added.</param>
-        <param name="sizeInFloats">To be added.</param>
-        <param name="readMode">To be added.</param>
-        <param name="audioBuffer">the direct buffer to which the recorded audio data is written.
-            Data is written to audioBuffer.position().</param>
-        <param name="sizeInBytes">the number of requested bytes. It is recommended but not enforced
-               that the number of bytes requested be a multiple of the frame size (sample size in
-               bytes multiplied by the channel count).</param>
-        <summary>Reads audio data from the audio hardware for recording into a direct buffer.</summary>
-        <returns>zero or the positive number of bytes that were read, or one of the following
-               error codes. The number of bytes will not exceed sizeInBytes and will be truncated to be
-               a multiple of the frame size.
+        <param name="audioData">the array to which the recorded audio data is written.</param>
+        <param name="offsetInFloats">index in audioData from which the data is written.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInFloats">the number of requested floats.
+                   Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="readMode">one of <c>#READ_BLOCKING</c>, <c>#READ_NON_BLOCKING</c>.
+                &lt;br&gt;With <c>#READ_BLOCKING</c>, the read will block until all the requested data
+                is read.
+                &lt;br&gt;With <c>#READ_NON_BLOCKING</c>, the read will return immediately after
+                reading as much audio data as possible without blocking.</param>
+        <summary>Reads audio data from the audio hardware for recording into a float array.</summary>
+        <returns>zero or the positive number of floats that were read, or one of the following
+               error codes. The number of floats will be a multiple of the channel count not to exceed
+               sizeInFloats.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the object isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -1434,7 +1434,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(java.nio.ByteBuffer,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(java.nio.ByteBuffer, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioRecord#read(float[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.read(float[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2343,9 +2343,18 @@
       <Docs>
         <param name="syncEvent">event that triggers the capture.</param>
         <summary>Starts recording from the AudioRecord instance when the specified synchronization event
- occurs on the specified audio session.</summary>
+            occurs on the specified audio session.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/media/AudioRecord#startRecording(android.media.MediaSyncEvent)" title="Reference documentation">Java documentation for <code>android.media.AudioRecord.startRecording(android.media.MediaSyncEvent)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 16" />
         <exception cref="T:Java.Lang.IllegalStateException" />
diff --git a/docs/Mono.Android/en/Android.Media/AudioTrack.xml b/docs/Mono.Android/en/Android.Media/AudioTrack.xml
index 5099e1672d..3eba621157 100644
--- a/docs/Mono.Android/en/Android.Media/AudioTrack.xml
+++ b/docs/Mono.Android/en/Android.Media/AudioTrack.xml
@@ -106,22 +106,6 @@
       <Docs>
         <param name="attributes">To be added.</param>
         <param name="format">To be added.</param>
-        <param name="sessionId">To be added.</param>
-        <param name="streamType">the type of the audio stream. See
-              <c>AudioManager#STREAM_VOICE_CALL</c>, <c>AudioManager#STREAM_SYSTEM</c>,
-              <c>AudioManager#STREAM_RING</c>, <c>AudioManager#STREAM_MUSIC</c>,
-              <c>AudioManager#STREAM_ALARM</c>, and <c>AudioManager#STREAM_NOTIFICATION</c>.</param>
-        <param name="sampleRateInHz">the initial source sample rate expressed in Hz.
-              <c>AudioFormat#SAMPLE_RATE_UNSPECIFIED</c> means to use a route-dependent value
-              which is usually the sample rate of the sink.
-              <c>#getSampleRate()</c> can be used to retrieve the actual sample rate chosen.</param>
-        <param name="channelConfig">describes the configuration of the audio channels.
-              See <c>AudioFormat#CHANNEL_OUT_MONO</c> and
-              <c>AudioFormat#CHANNEL_OUT_STEREO</c></param>
-        <param name="audioFormat">the format in which the audio data is represented.
-              See <c>AudioFormat#ENCODING_PCM_16BIT</c>,
-              <c>AudioFormat#ENCODING_PCM_8BIT</c>,
-              and <c>AudioFormat#ENCODING_PCM_FLOAT</c>.</param>
         <param name="bufferSizeInBytes">the total size (in bytes) of the internal buffer where audio data is
               read from for playback. This should be a nonzero multiple of the frame size in bytes.
               &lt;p&gt; If the track's creation mode is <c>#MODE_STATIC</c>,
@@ -140,6 +124,7 @@
               See <c>#getMinBufferSize(int, int, int)</c> to determine the estimated minimum buffer size
               for an AudioTrack instance in streaming mode.</param>
         <param name="mode">streaming or static buffer. See <c>#MODE_STATIC</c> and <c>#MODE_STREAM</c></param>
+        <param name="sessionId">To be added.</param>
         <summary>Class constructor.</summary>
         <remarks>
           <para>
@@ -456,20 +441,18 @@
         <Parameter Name="sessionId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sessionId">To be added.</param>
         <param name="streamType">the type of the audio stream. See
               <c>AudioManager#STREAM_VOICE_CALL</c>, <c>AudioManager#STREAM_SYSTEM</c>,
               <c>AudioManager#STREAM_RING</c>, <c>AudioManager#STREAM_MUSIC</c>,
               <c>AudioManager#STREAM_ALARM</c>, and <c>AudioManager#STREAM_NOTIFICATION</c>.</param>
         <param name="sampleRateInHz">the initial source sample rate expressed in Hz.
               <c>AudioFormat#SAMPLE_RATE_UNSPECIFIED</c> means to use a route-dependent value
-              which is usually the sample rate of the sink.
-              <c>#getSampleRate()</c> can be used to retrieve the actual sample rate chosen.</param>
+              which is usually the sample rate of the sink.</param>
         <param name="channelConfig">describes the configuration of the audio channels.
               See <c>AudioFormat#CHANNEL_OUT_MONO</c> and
               <c>AudioFormat#CHANNEL_OUT_STEREO</c></param>
         <param name="audioFormat">the format in which the audio data is represented.
-              See <c>AudioFormat#ENCODING_PCM_16BIT</c>,
+              See <c>AudioFormat#ENCODING_PCM_16BIT</c> and
               <c>AudioFormat#ENCODING_PCM_8BIT</c>,
               and <c>AudioFormat#ENCODING_PCM_FLOAT</c>.</param>
         <param name="bufferSizeInBytes">the total size (in bytes) of the internal buffer where audio data is
@@ -487,14 +470,16 @@
               actual size in frames of the buffer created, which
               determines the minimum frequency to write
               to the streaming &lt;code&gt;AudioTrack&lt;/code&gt; to avoid underrun.
+              You can write data into this buffer in smaller chunks than this size.
               See <c>#getMinBufferSize(int, int, int)</c> to determine the estimated minimum buffer size
               for an AudioTrack instance in streaming mode.</param>
         <param name="mode">streaming or static buffer. See <c>#MODE_STATIC</c> and <c>#MODE_STREAM</c></param>
-        <summary>Class constructor.</summary>
+        <param name="sessionId">Id of audio session the AudioTrack must be attached to</param>
+        <summary>Class constructor with audio session.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioTrack#AudioTrack(int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.AudioTrack(int, int, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioTrack#AudioTrack(int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.AudioTrack(int, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4254,27 +4239,17 @@
         <Parameter Name="sizeInBytes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offsetInBytes">the offset expressed in bytes in audioData where the data to play
-    starts.</param>
-        <param name="audioData">the buffer that holds the data to write, starting at the position reported
-                by &lt;code&gt;audioData.position()&lt;/code&gt;.
-                &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
-                have been advanced to reflect the amount of data that was successfully written to
-                the AudioTrack.</param>
-        <param name="sizeInBytes">number of bytes to write.  It is recommended but not enforced
-                that the number of bytes requested be a multiple of the frame size (sample size in
-                bytes multiplied by the channel count).
-                &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
-        <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>. It has no
-                effect in static mode.
-                &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
-                    to the audio sink.
-                &lt;BR&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
-                queuing as much audio data for playback as possible without blocking.</param>
+        <param name="audioData">the array that holds the data to play.</param>
+        <param name="offsetInBytes">the offset expressed in bytes in audioData where the data to write
+               starts.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInBytes">the number of bytes to write in audioData after the offset.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
         <summary>Writes the audio data to the audio sink for playback (streaming mode),
             or copies audio data for later playback (static buffer mode).</summary>
         <returns>zero or the positive number of bytes that were written, or one of the following
-               error codes.
+               error codes. The number of bytes will be a multiple of the frame size in bytes
+               not to exceed sizeInBytes.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the track isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -4282,11 +4257,13 @@
                needs to be recreated. The dead object error code is not returned if some data was
                successfully transferred. In this case, the error is returned at the next write()&lt;/li&gt;
             &lt;li&gt;<c>#ERROR</c> in case of other error&lt;/li&gt;
-            &lt;/ul&gt;</returns>
+            &lt;/ul&gt;
+            This is equivalent to <c>#write(byte[], int, int, int)</c> with &lt;code&gt;writeMode&lt;/code&gt;
+            set to  <c>#WRITE_BLOCKING</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(java.nio.ByteBuffer,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(java.nio.ByteBuffer, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4323,28 +4300,17 @@
         <Parameter Name="sizeInShorts" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="audioData">the array that holds the data to play.</param>
         <param name="offsetInShorts">the offset expressed in shorts in audioData where the data to play
-     starts.</param>
-        <param name="sizeInShorts">the number of shorts to read in audioData after the offset.</param>
-        <param name="audioData">the buffer that holds the data to write, starting at the position reported
-                by &lt;code&gt;audioData.position()&lt;/code&gt;.
-                &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
-                have been advanced to reflect the amount of data that was successfully written to
-                the AudioTrack.</param>
-        <param name="sizeInBytes">number of bytes to write.  It is recommended but not enforced
-                that the number of bytes requested be a multiple of the frame size (sample size in
-                bytes multiplied by the channel count).
-                &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
-        <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>. It has no
-                effect in static mode.
-                &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
-                    to the audio sink.
-                &lt;BR&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
-                queuing as much audio data for playback as possible without blocking.</param>
+                starts.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInShorts">the number of shorts to read in audioData after the offset.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
         <summary>Writes the audio data to the audio sink for playback (streaming mode),
             or copies audio data for later playback (static buffer mode).</summary>
-        <returns>zero or the positive number of bytes that were written, or one of the following
-               error codes.
+        <returns>zero or the positive number of shorts that were written, or one of the following
+               error codes. The number of shorts will be a multiple of the channel count not to
+               exceed sizeInShorts.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the track isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -4352,11 +4318,13 @@
                needs to be recreated. The dead object error code is not returned if some data was
                successfully transferred. In this case, the error is returned at the next write()&lt;/li&gt;
             &lt;li&gt;<c>#ERROR</c> in case of other error&lt;/li&gt;
-            &lt;/ul&gt;</returns>
+            &lt;/ul&gt;
+            This is equivalent to <c>#write(short[], int, int, int)</c> with &lt;code&gt;writeMode&lt;/code&gt;
+            set to  <c>#WRITE_BLOCKING</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(java.nio.ByteBuffer,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(java.nio.ByteBuffer, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4401,7 +4369,6 @@
         <Parameter Name="timestamp" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timestamp">To be added.</param>
         <param name="audioData">the buffer that holds the data to write, starting at the position reported
                 by &lt;code&gt;audioData.position()&lt;/code&gt;.
                 &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
@@ -4411,14 +4378,14 @@
                 that the number of bytes requested be a multiple of the frame size (sample size in
                 bytes multiplied by the channel count).
                 &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
-        <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>. It has no
-                effect in static mode.
+        <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>.
                 &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
                     to the audio sink.
                 &lt;BR&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
                 queuing as much audio data for playback as possible without blocking.</param>
-        <summary>Writes the audio data to the audio sink for playback (streaming mode),
-            or copies audio data for later playback (static buffer mode).</summary>
+        <param name="timestamp">The timestamp, in nanoseconds, of the first decodable audio frame in the
+                provided audioData.</param>
+        <summary>Writes the audio data to the audio sink for playback in streaming mode on a HW_AV_SYNC track.</summary>
         <returns>zero or the positive number of bytes that were written, or one of the following
                error codes.
             &lt;ul&gt;
@@ -4432,7 +4399,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(java.nio.ByteBuffer,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(java.nio.ByteBuffer, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(java.nio.ByteBuffer,%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(java.nio.ByteBuffer, int, int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4476,26 +4443,23 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="offsetInBytes">To be added.</param>
-        <param name="audioData">the buffer that holds the data to write, starting at the position reported
-                by &lt;code&gt;audioData.position()&lt;/code&gt;.
-                &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
-                have been advanced to reflect the amount of data that was successfully written to
-                the AudioTrack.</param>
-        <param name="sizeInBytes">number of bytes to write.  It is recommended but not enforced
-                that the number of bytes requested be a multiple of the frame size (sample size in
-                bytes multiplied by the channel count).
-                &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
+        <param name="audioData">the array that holds the data to play.</param>
+        <param name="offsetInBytes">the offset expressed in bytes in audioData where the data to write
+               starts.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInBytes">the number of bytes to write in audioData after the offset.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
         <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>. It has no
                 effect in static mode.
-                &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
+                &lt;br&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
                     to the audio sink.
-                &lt;BR&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
+                &lt;br&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
                 queuing as much audio data for playback as possible without blocking.</param>
         <summary>Writes the audio data to the audio sink for playback (streaming mode),
             or copies audio data for later playback (static buffer mode).</summary>
         <returns>zero or the positive number of bytes that were written, or one of the following
-               error codes.
+               error codes. The number of bytes will be a multiple of the frame size in bytes
+               not to exceed sizeInBytes.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the track isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -4507,7 +4471,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(java.nio.ByteBuffer,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(java.nio.ByteBuffer, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4551,27 +4515,23 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="offsetInShorts">To be added.</param>
-        <param name="sizeInShorts">To be added.</param>
-        <param name="audioData">the buffer that holds the data to write, starting at the position reported
-                by &lt;code&gt;audioData.position()&lt;/code&gt;.
-                &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
-                have been advanced to reflect the amount of data that was successfully written to
-                the AudioTrack.</param>
-        <param name="sizeInBytes">number of bytes to write.  It is recommended but not enforced
-                that the number of bytes requested be a multiple of the frame size (sample size in
-                bytes multiplied by the channel count).
-                &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
+        <param name="audioData">the array that holds the data to write.</param>
+        <param name="offsetInShorts">the offset expressed in shorts in audioData where the data to write
+                starts.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInShorts">the number of shorts to read in audioData after the offset.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
         <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>. It has no
                 effect in static mode.
-                &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
+                &lt;br&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
                     to the audio sink.
-                &lt;BR&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
+                &lt;br&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
                 queuing as much audio data for playback as possible without blocking.</param>
         <summary>Writes the audio data to the audio sink for playback (streaming mode),
             or copies audio data for later playback (static buffer mode).</summary>
-        <returns>zero or the positive number of bytes that were written, or one of the following
-               error codes.
+        <returns>zero or the positive number of shorts that were written, or one of the following
+               error codes. The number of shorts will be a multiple of the channel count not to
+               exceed sizeInShorts.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the track isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -4583,7 +4543,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(java.nio.ByteBuffer,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(java.nio.ByteBuffer, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(short[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(short[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4627,28 +4587,32 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="audioData">the array that holds the data to write.
+                The implementation does not clip for sample values within the nominal range
+                [-1.0f, 1.0f], provided that all gains in the audio pipeline are
+                less than or equal to unity (1.0f), and in the absence of post-processing effects
+                that could add energy, such as reverb.  For the convenience of applications
+                that compute samples using filters with non-unity gain,
+                sample values +3 dB beyond the nominal range are permitted.
+                However such values may eventually be limited or clipped, depending on various gains
+                and later processing in the audio path.  Therefore applications are encouraged
+                to provide samples values within the nominal range.</param>
         <param name="offsetInFloats">the offset, expressed as a number of floats,
-     in audioData where the data to play starts.</param>
-        <param name="sizeInFloats">the number of floats to read in audioData after the offset.</param>
-        <param name="audioData">the buffer that holds the data to write, starting at the position reported
-                by &lt;code&gt;audioData.position()&lt;/code&gt;.
-                &lt;BR&gt;Note that upon return, the buffer position (&lt;code&gt;audioData.position()&lt;/code&gt;) will
-                have been advanced to reflect the amount of data that was successfully written to
-                the AudioTrack.</param>
-        <param name="sizeInBytes">number of bytes to write.  It is recommended but not enforced
-                that the number of bytes requested be a multiple of the frame size (sample size in
-                bytes multiplied by the channel count).
-                &lt;BR&gt;Note this may differ from &lt;code&gt;audioData.remaining()&lt;/code&gt;, but cannot exceed it.</param>
+                in audioData where the data to write starts.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
+        <param name="sizeInFloats">the number of floats to write in audioData after the offset.
+               Must not be negative, or cause the data access to go out of bounds of the array.</param>
         <param name="writeMode">one of <c>#WRITE_BLOCKING</c>, <c>#WRITE_NON_BLOCKING</c>. It has no
                 effect in static mode.
-                &lt;BR&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
+                &lt;br&gt;With <c>#WRITE_BLOCKING</c>, the write will block until all data has been written
                     to the audio sink.
-                &lt;BR&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
+                &lt;br&gt;With <c>#WRITE_NON_BLOCKING</c>, the write will return immediately after
                 queuing as much audio data for playback as possible without blocking.</param>
         <summary>Writes the audio data to the audio sink for playback (streaming mode),
             or copies audio data for later playback (static buffer mode).</summary>
-        <returns>zero or the positive number of bytes that were written, or one of the following
-               error codes.
+        <returns>zero or the positive number of floats that were written, or one of the following
+               error codes. The number of floats will be a multiple of the channel count not to
+               exceed sizeInFloats.
             &lt;ul&gt;
             &lt;li&gt;<c>#ERROR_INVALID_OPERATION</c> if the track isn't properly initialized&lt;/li&gt;
             &lt;li&gt;<c>#ERROR_BAD_VALUE</c> if the parameters don't resolve to valid data and indexes&lt;/li&gt;
@@ -4660,7 +4624,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(java.nio.ByteBuffer,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(java.nio.ByteBuffer, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/AudioTrack#write(float[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.AudioTrack.write(float[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/CamcorderProfile.xml b/docs/Mono.Android/en/Android.Media/CamcorderProfile.xml
index ae4d702ce9..45cf650e13 100644
--- a/docs/Mono.Android/en/Android.Media/CamcorderProfile.xml
+++ b/docs/Mono.Android/en/Android.Media/CamcorderProfile.xml
@@ -369,15 +369,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="cameraId">the id for the camera</param>
-        <param name="quality">the target quality level for the camcorder profile</param>
-        <summary>Returns the default camcorder profile at the given quality level for the first back-facing
-            camera on the device.</summary>
+        <param name="cameraId">the id for the camera. Integer camera ids parsed from the list received by
+                            invoking <c>CameraManager#getCameraIdList</c> can be used as long as they
+                            are <c>CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE</c>
+                            and not
+                            <c>CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL EXTERNAL</c>.</param>
+        <param name="quality">the target quality level for the camcorder profile.</param>
+        <summary>Returns the default camcorder profile for the given camera at the given quality level.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/CamcorderProfile#get(int)" title="Reference documentation">Java documentation for <code>android.media.CamcorderProfile.get(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/CamcorderProfile#get(int,%20int)" title="Reference documentation">Java documentation for <code>android.media.CamcorderProfile.get(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -530,15 +533,19 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="cameraId">the id for the camera</param>
+        <param name="cameraId">the id for the camera. Integer camera ids parsed from the list received by
+                            invoking <c>CameraManager#getCameraIdList</c> can be used as long as they
+                            are <c>CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE</c>
+                            and not
+                            <c>CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL EXTERNAL</c>.</param>
         <param name="quality">the target quality level for the camcorder profile</param>
-        <summary>Returns true if a camcorder profile exists for the first back-facing
-            camera at the given quality level.</summary>
+        <summary>Returns true if a camcorder profile exists for the given camera at
+            the given quality level.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/CamcorderProfile#hasProfile(int)" title="Reference documentation">Java documentation for <code>android.media.CamcorderProfile.hasProfile(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/CamcorderProfile#hasProfile(int,%20int)" title="Reference documentation">Java documentation for <code>android.media.CamcorderProfile.hasProfile(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/CameraProfile.xml b/docs/Mono.Android/en/Android.Media/CameraProfile.xml
index 4cb2173d41..d2f39e283f 100644
--- a/docs/Mono.Android/en/Android.Media/CameraProfile.xml
+++ b/docs/Mono.Android/en/Android.Media/CameraProfile.xml
@@ -169,12 +169,12 @@
         <param name="quality">The target quality level</param>
         <summary>Returns a pre-defined still image capture (jpeg) quality level
             used for the given quality level in the Camera application for
-            the first back-facing camera on the device.</summary>
+            the specified camera.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/CameraProfile#getJpegEncodingQualityParameter(int)" title="Reference documentation">Java documentation for <code>android.media.CameraProfile.getJpegEncodingQualityParameter(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/CameraProfile#getJpegEncodingQualityParameter(int,%20int)" title="Reference documentation">Java documentation for <code>android.media.CameraProfile.getJpegEncodingQualityParameter(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/ExifInterface.xml b/docs/Mono.Android/en/Android.Media/ExifInterface.xml
index de98673423..047443f400 100644
--- a/docs/Mono.Android/en/Android.Media/ExifInterface.xml
+++ b/docs/Mono.Android/en/Android.Media/ExifInterface.xml
@@ -90,13 +90,12 @@
         <Parameter Name="fileDescriptor" Type="Java.IO.FileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="fileDescriptor">To be added.</param>
-        <param name="file">the file of the image data</param>
-        <summary>Reads Exif tags from the specified image file.</summary>
+        <param name="fileDescriptor">the file descriptor of the image data</param>
+        <summary>Reads Exif tags from the specified image file descriptor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.io.File)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +126,12 @@
         <Parameter Name="inputStream" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="inputStream">To be added.</param>
-        <param name="file">the file of the image data</param>
-        <summary>Reads Exif tags from the specified image file.</summary>
+        <param name="inputStream">the input stream that contains the image data</param>
+        <summary>Reads Exif tags from the specified image input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.io.File)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -164,13 +162,12 @@
         <Parameter Name="filename" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="filename">To be added.</param>
-        <param name="file">the file of the image data</param>
+        <param name="filename">the name of the file of the image data</param>
         <summary>Reads Exif tags from the specified image file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.io.File)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -234,14 +231,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="inputStream">To be added.</param>
-        <param name="streamType">To be added.</param>
-        <param name="file">the file of the image data</param>
-        <summary>Reads Exif tags from the specified image file.</summary>
+        <param name="inputStream">the input stream that contains the image data</param>
+        <param name="streamType">the type of input stream</param>
+        <summary>Reads Exif tags from the specified image input stream based on the stream type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.io.File)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ExifInterface#ExifInterface(java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>android.media.ExifInterface.ExifInterface(java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/IAudioMetadataMap.xml b/docs/Mono.Android/en/Android.Media/IAudioMetadataMap.xml
index d8336a06ed..073f4a68fc 100644
--- a/docs/Mono.Android/en/Android.Media/IAudioMetadataMap.xml
+++ b/docs/Mono.Android/en/Android.Media/IAudioMetadataMap.xml
@@ -60,7 +60,6 @@
       </Parameters>
       <Docs>
         <param name="key">interface for storing the value.</param>
-        <param name="&lt;T&gt;&lt;T&gt;">type of value.</param>
         <summary>Removes the value associated with the key.</summary>
         <returns>the value of the key, null if it doesn't exist.</returns>
         <remarks>
@@ -106,7 +105,6 @@
       </Parameters>
       <Docs>
         <param name="key">interface for storing the value.</param>
-        <param name="&lt;T&gt;&lt;T&gt;">type of value.</param>
         <param name="value">a non-null value of type T.</param>
         <summary>Sets a value for the key.</summary>
         <returns>the previous value associated with key or null if it doesn't exist.</returns>
diff --git a/docs/Mono.Android/en/Android.Media/IAudioMetadataReadMap.xml b/docs/Mono.Android/en/Android.Media/IAudioMetadataReadMap.xml
index ec276afd06..44e6dddcd0 100644
--- a/docs/Mono.Android/en/Android.Media/IAudioMetadataReadMap.xml
+++ b/docs/Mono.Android/en/Android.Media/IAudioMetadataReadMap.xml
@@ -57,7 +57,6 @@
       </Parameters>
       <Docs>
         <param name="key">interface for requesting the value.</param>
-        <param name="&lt;T&gt;&lt;T&gt;">type of value.</param>
         <summary>Returns true if the key exists in the map.</summary>
         <returns>true if key exists in the Map.</returns>
         <remarks>
@@ -139,7 +138,6 @@
       </Parameters>
       <Docs>
         <param name="key">interface for requesting the value.</param>
-        <param name="&lt;T&gt;&lt;T&gt;">type of value.</param>
         <summary>Returns the value associated with the key.</summary>
         <returns>returns the value of associated with key or null if it doesn't exist.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Media/ImageReader.xml b/docs/Mono.Android/en/Android.Media/ImageReader.xml
index e5e1b693d5..ec3cf2d9b6 100644
--- a/docs/Mono.Android/en/Android.Media/ImageReader.xml
+++ b/docs/Mono.Android/en/Android.Media/ImageReader.xml
@@ -468,28 +468,27 @@
         <Parameter Name="usage" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="usage">To be added.</param>
-        <param name="width">The default width in pixels of the Images that this reader
-                       will produce.</param>
-        <param name="height">The default height in pixels of the Images that this reader
-                       will produce.</param>
-        <param name="format">The format of the Image that this reader will produce. This
-                       must be one of the <c>android.graphics.ImageFormat</c> or
-                       <c>android.graphics.PixelFormat</c> constants. Note that not
-                       all formats are supported, like ImageFormat.NV21.</param>
-        <param name="maxImages">The maximum number of images the user will want to
-                       access simultaneously. This should be as small as possible to
-                       limit memory use. Once maxImages Images are obtained by the
-                       user, one of them has to be released before a new Image will
-                       become available for access through
-                       <c>#acquireLatestImage()</c> or <c>#acquireNextImage()</c>.
-                       Must be greater than 0.</param>
-        <summary>Create a new reader for images of the desired size and format.</summary>
+        <param name="width">The default width in pixels of the Images that this reader will produce.</param>
+        <param name="height">The default height in pixels of the Images that this reader will produce.</param>
+        <param name="format">The format of the Image that this reader will produce. This must be one of the
+                       <c>android.graphics.ImageFormat</c> or <c>android.graphics.PixelFormat</c>
+                       constants. Note that not all formats are supported, like ImageFormat.NV21.</param>
+        <param name="maxImages">The maximum number of images the user will want to access simultaneously.
+                       This should be as small as possible to limit memory use. Once maxImages Images are
+                       obtained by the user, one of them has to be released before a new Image will
+                       become available for access through <c>#acquireLatestImage()</c> or
+                       <c>#acquireNextImage()</c>. Must be greater than 0.</param>
+        <param name="usage">The intended usage of the images produced by this ImageReader. See the usages
+                         on <c>HardwareBuffer</c> for a list of valid usage bits. See also
+                         <c>HardwareBuffer#isSupported(int, int, int, int, long)</c> for checking
+                         if a combination is supported. If it's not supported this will throw
+                         an <c>IllegalArgumentException</c>.</param>
+        <summary>Create a new reader for images of the desired size, format and consumer usage flag.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ImageReader#newInstance(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.ImageReader.newInstance(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ImageReader#newInstance(int,%20int,%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.media.ImageReader.newInstance(int, int, int, int, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/ImageWriter.xml b/docs/Mono.Android/en/Android.Media/ImageWriter.xml
index 4b53773729..85fb310d42 100644
--- a/docs/Mono.Android/en/Android.Media/ImageWriter.xml
+++ b/docs/Mono.Android/en/Android.Media/ImageWriter.xml
@@ -336,7 +336,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="format">To be added.</param>
         <param name="surface">The destination Surface this writer produces Image data
                        into.</param>
         <param name="maxImages">The maximum number of Images the user will want to
@@ -345,12 +344,14 @@
                        Images are dequeued by the user, one of them has to be queued
                        back before a new Image can be dequeued for access via
                        <c>#dequeueInputImage()</c>.</param>
-        <summary>Create a new ImageWriter.</summary>
+        <param name="format">The format of this ImageWriter. It can be any valid format specified by
+                       <c>ImageFormat</c> or <c>PixelFormat</c>.</param>
+        <summary>Create a new ImageWriter with given number of max Images and format.</summary>
         <returns>a new ImageWriter instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ImageWriter#newInstance(android.view.Surface,%20int)" title="Reference documentation">Java documentation for <code>android.media.ImageWriter.newInstance(android.view.Surface, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ImageWriter#newInstance(android.view.Surface,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.ImageWriter.newInstance(android.view.Surface, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/JetPlayer.xml b/docs/Mono.Android/en/Android.Media/JetPlayer.xml
index 670277d364..6a39fcc38a 100644
--- a/docs/Mono.Android/en/Android.Media/JetPlayer.xml
+++ b/docs/Mono.Android/en/Android.Media/JetPlayer.xml
@@ -386,13 +386,12 @@
       </Parameters>
       <Docs>
         <param name="path">the path to the .jet file, for instance "/sdcard/mygame/music.jet".</param>
-        <param name="afd">the asset file descriptor.</param>
         <summary>Loads a .</summary>
         <returns>true if loading the .jet file was successful, false if loading failed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/JetPlayer#loadJetFile(android.content.res.AssetFileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.JetPlayer.loadJetFile(android.content.res.AssetFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/JetPlayer#loadJetFile(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.JetPlayer.loadJetFile(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/MediaCas.xml b/docs/Mono.Android/en/Android.Media/MediaCas.xml
index 747f0c4f56..c192982012 100644
--- a/docs/Mono.Android/en/Android.Media/MediaCas.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaCas.xml
@@ -113,15 +113,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="tvInputServiceSessionId">To be added.</param>
-        <param name="priorityHint">To be added.</param>
+        <param name="context">the context of the caller.</param>
         <param name="casSystemId">The system id of the CA system.</param>
+        <param name="tvInputServiceSessionId">The Id of the session opened in TV Input Service (TIS)
+                   <c>android.media.tv.TvInputService#onCreateSession(String, String)</c></param>
+        <param name="priorityHint">priority hint from the use case type for new created CAS system.</param>
         <summary>Instantiate a CA system of the specified system id.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaCas#MediaCas(int)" title="Reference documentation">Java documentation for <code>android.media.MediaCas.MediaCas(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaCas#MediaCas(android.content.Context,%20int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaCas.MediaCas(android.content.Context, int, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -165,11 +166,11 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
+        <param name="casSystemId">The system id of the CA system.</param>
         <param name="tvInputServiceSessionId">To be added.</param>
         <param name="priorityHint">To be added.</param>
         <param name="handler">To be added.</param>
         <param name="listener">To be added.</param>
-        <param name="casSystemId">The system id of the CA system.</param>
         <summary>Instantiate a CA system of the specified system id.</summary>
         <remarks>
           <para>
@@ -566,14 +567,14 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
         <param name="data">byte array of the EMM data.</param>
+        <param name="offset">position within data where the EMM data begins.</param>
+        <param name="length">length of the data (starting from offset).</param>
         <summary>Send a received EMM packet to the CA system.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaCas#processEmm(byte[])" title="Reference documentation">Java documentation for <code>android.media.MediaCas.processEmm(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaCas#processEmm(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaCas.processEmm(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/MediaCodec.xml b/docs/Mono.Android/en/Android.Media/MediaCodec.xml
index 3396bfa1ba..67ee904781 100644
--- a/docs/Mono.Android/en/Android.Media/MediaCodec.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaCodec.xml
@@ -407,9 +407,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="crypto">Specify a crypto object to facilitate secure decryption
-                of the media data. Pass <c>null</c> as <c>crypto</c> for
-                non-secure codecs.</param>
         <param name="format">The format of the input data (decoder) or the desired
                           format of the output data (encoder). Passing <c>null</c>
                           as <c>format</c> is equivalent to passing an
@@ -419,15 +416,20 @@
                            codec does not generate raw video output (e.g. not a video
                            decoder) and/or if you want to configure the codec for
                            <c>ByteBuffer</c> output.</param>
+        <param name="crypto">Specify a crypto object to facilitate secure decryption
+                           of the media data. Pass <c>null</c> as <c>crypto</c> for
+                           non-secure codecs.
+                           Please note that <c>MediaCodec</c> does NOT take ownership
+                           of the <c>MediaCrypto</c> object; it is the application's
+                           responsibility to properly cleanup the <c>MediaCrypto</c> object
+                           when not in use.</param>
         <param name="flags">Specify <c>#CONFIGURE_FLAG_ENCODE</c> to configure the
                            component as an encoder.</param>
-        <param name="descrambler">Specify a descrambler object to facilitate secure
-                           descrambling of the media data, or null for non-secure codecs.</param>
-        <summary>Configure a component to be used with a descrambler.</summary>
+        <summary>Configures a component.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaCodec#configure(android.media.MediaFormat,%20android.view.Surface,%20int,%20android.media.MediaDescrambler)" title="Reference documentation">Java documentation for <code>android.media.MediaCodec.configure(android.media.MediaFormat, android.view.Surface, int, android.media.MediaDescrambler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaCodec#configure(android.media.MediaFormat,%20android.view.Surface,%20android.media.MediaCrypto,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaCodec.configure(android.media.MediaFormat, android.view.Surface, android.media.MediaCrypto, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1230,14 +1232,14 @@
       </Parameters>
       <Docs>
         <param name="index">The index of a client-owned input buffer previously
-              returned from a call to <see cref="M:Android.Media.MediaCodec.DequeueInputBuffer(System.Int64)" />.</param>
-        <summary>Call this after dequeueOutputBuffer signals a format change by returning
-            <c>#INFO_OUTPUT_FORMAT_CHANGED</c>.</summary>
-        <returns>To be added.</returns>
+                         returned from a call to <c>#dequeueInputBuffer</c>.</param>
+        <summary>Returns the output format for a specific output buffer.</summary>
+        <returns>the format for the output buffer, or null if the index
+            is not a dequeued output buffer.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaCodec#getOutputFormat()" title="Reference documentation">Java documentation for <code>android.media.MediaCodec.getOutputFormat()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaCodec#getOutputFormat(int)" title="Reference documentation">Java documentation for <code>android.media.MediaCodec.getOutputFormat(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2268,18 +2270,16 @@
         <Parameter Name="render" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="render">If a valid surface was specified when configuring the codec,
-               passing true renders this output buffer to the surface.</param>
         <param name="index">The index of a client-owned output buffer previously returned
                          from a call to <c>#dequeueOutputBuffer</c>.</param>
-        <param name="renderTimestampNs">The timestamp to associate with this buffer when
-                         it is sent to the Surface.</param>
-        <summary>If you are done with a buffer, use this call to update its surface timestamp
-            and return it to the codec to render it on the output surface.</summary>
+        <param name="render">If a valid surface was specified when configuring the codec,
+                          passing true renders this output buffer to the surface.</param>
+        <summary>If you are done with a buffer, use this call to return the buffer to the codec
+            or to render it on the output surface.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaCodec#releaseOutputBuffer(int,%20long)" title="Reference documentation">Java documentation for <code>android.media.MediaCodec.releaseOutputBuffer(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaCodec#releaseOutputBuffer(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.media.MediaCodec.releaseOutputBuffer(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -2487,10 +2487,10 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="cb">The callback that will run.  Use <c>null</c> to clear a previously
                       set callback (before <c>#configure configure</c> is called and run
                       in synchronous mode).</param>
+        <param name="handler">To be added.</param>
         <summary>Sets an asynchronous callback for actionable MediaCodec events on the default
             looper.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Media/MediaDrm.xml b/docs/Mono.Android/en/Android.Media/MediaDrm.xml
index 1d5fa441ca..3e75e27a44 100644
--- a/docs/Mono.Android/en/Android.Media/MediaDrm.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaDrm.xml
@@ -1370,17 +1370,17 @@
         <Parameter Name="mimeType" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="mimeType">The MIME type of the media container, e.g. "video/mp4"
-   or "video/webm"
-</param>
         <param name="uuid">The UUID of the crypto scheme.</param>
+        <param name="mimeType">The MIME type of the media container, e.g. "video/mp4"
+              or "video/webm"</param>
         <summary>Query if the given scheme identified by its UUID is supported on
-            this device.</summary>
+            this device, and whether the DRM plugin is able to handle the
+            media container format specified by mimeType.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaDrm#isCryptoSchemeSupported(java.util.UUID)" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.isCryptoSchemeSupported(java.util.UUID)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaDrm#isCryptoSchemeSupported(java.util.UUID,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.isCryptoSchemeSupported(java.util.UUID, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1423,16 +1423,19 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mimeType">To be added.</param>
-        <param name="securityLevel">To be added.</param>
         <param name="uuid">The UUID of the crypto scheme.</param>
+        <param name="mimeType">The MIME type of the media container, e.g. "video/mp4"
+              or "video/webm"</param>
+        <param name="securityLevel">the security level requested</param>
         <summary>Query if the given scheme identified by its UUID is supported on
-            this device.</summary>
+            this device, and whether the DRM plugin is able to handle the
+            media container format specified by mimeType at the requested
+            security level.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaDrm#isCryptoSchemeSupported(java.util.UUID)" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.isCryptoSchemeSupported(java.util.UUID)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaDrm#isCryptoSchemeSupported(java.util.UUID,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.isCryptoSchemeSupported(java.util.UUID, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2044,13 +2047,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="level">To be added.</param>
-        <summary>Open a new session with the MediaDrm object.</summary>
+        <param name="level">the new security level</param>
+        <summary>Open a new session at a requested security level.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaDrm#openSession()" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.openSession()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaDrm#openSession(int)" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.openSession(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2766,16 +2769,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="level">To be added.</param>
-        <param name="mime">The mime type of the media data. Please use <c>#isCryptoSchemeSupported(UUID, String)</c> to query mime type support separately;
-                        for unsupported mime types the return value of <c>#requiresSecureDecoder(String)</c> is crypto scheme dependent.</param>
+        <param name="mime">The mime type of the media data. Please use <c>#isCryptoSchemeSupported(UUID, String, int)</c> to query mime type support
+                        separately; for unsupported mime types the return value of <c>#requiresSecureDecoder(String, int)</c> is crypto scheme dependent.</param>
+        <param name="level">a security level between <c>#SECURITY_LEVEL_SW_SECURE_CRYPTO</c>
+                         and <c>#SECURITY_LEVEL_HW_SECURE_ALL</c>. Otherwise the special value
+                         <c>#getMaxSecurityLevel()</c> is also permitted;
+                         use <c>#getMaxSecurityLevel()</c> to indicate the maximum security level
+                         supported by the device.</param>
         <summary>Query if the crypto scheme requires the use of a secure decoder
-            to decode data of the given mime type at the default security level.</summary>
+            to decode data of the given mime type at the given security level.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaDrm#requiresSecureDecoder(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.requiresSecureDecoder(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaDrm#requiresSecureDecoder(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaDrm.requiresSecureDecoder(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3212,9 +3219,9 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">the callback that will be run.  Use <c>null</c> to
                    stop receiving event callbacks.</param>
+        <param name="handler">To be added.</param>
         <summary>Register a callback to be invoked when an event occurs</summary>
         <remarks>
           <para>
@@ -3343,8 +3350,6 @@
         <param name="executor">To be added.</param>
         <param name="listener">the callback that will be run, or <c>null</c> to unregister the
                 previously registered callback.</param>
-        <param name="handler">the handler on which the listener should be invoked, or
-                <c>null</c> if the listener should be invoked on the calling thread's looper.</param>
         <summary>Register a callback to be invoked when a session expiration update
             occurs.</summary>
         <remarks>
@@ -3432,8 +3437,6 @@
         <param name="executor">To be added.</param>
         <param name="listener">the callback that will be run when key status changes, or
                 <c>null</c> to unregister the previously registered callback.</param>
-        <param name="handler">the handler on which the listener should be invoked, or
-                null if the listener should be invoked on the calling thread's looper.</param>
         <summary>Register a callback to be invoked when the state of keys in a session
             change, e.</summary>
         <remarks>
@@ -3521,8 +3524,6 @@
         <param name="executor">To be added.</param>
         <param name="listener">the callback that will be run, or <c>null</c> to unregister the
                 previously registered callback.</param>
-        <param name="handler">the handler on which the listener should be invoked, or
-                <c>null</c> if the listener should be invoked on the calling thread's looper.</param>
         <summary>Register a callback to be invoked when session state has been
             lost.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Media/MediaExtractor.xml b/docs/Mono.Android/en/Android.Media/MediaExtractor.xml
index d2e82730dc..2e1e5ccaaa 100644
--- a/docs/Mono.Android/en/Android.Media/MediaExtractor.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaExtractor.xml
@@ -1175,20 +1175,12 @@
         <Parameter Name="afd" Type="Android.Content.Res.AssetFileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="afd">To be added.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to extract from.
-            
-            &lt;p&gt;When &lt;code&gt;uri&lt;/code&gt; refers to a network file the
-            <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
-        <param name="headers">the headers to be sent together with the request for the data.
-                   This can be <c>null</c> if no specific headers are to be sent with the
-                   request.</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="afd">the AssetFileDescriptor for the file you want to extract from.</param>
+        <summary>Sets the data source (AssetFileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.content.Context, android.net.Uri, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.content.res.AssetFileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.content.res.AssetFileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1222,20 +1214,12 @@
         <Parameter Name="dataSource" Type="Android.Media.MediaDataSource" />
       </Parameters>
       <Docs>
-        <param name="dataSource">To be added.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to extract from.
-            
-            &lt;p&gt;When &lt;code&gt;uri&lt;/code&gt; refers to a network file the
-            <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
-        <param name="headers">the headers to be sent together with the request for the data.
-                   This can be <c>null</c> if no specific headers are to be sent with the
-                   request.</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="dataSource">the MediaDataSource for the media you want to extract from</param>
+        <summary>Sets the data source (MediaDataSource) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.content.Context, android.net.Uri, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.media.MediaDataSource)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.media.MediaDataSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -1269,21 +1253,12 @@
         <Parameter Name="fd" Type="Java.IO.FileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="fd">the FileDescriptor for the file you want to extract from.
-</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to extract from.
-            
-            &lt;p&gt;When &lt;code&gt;uri&lt;/code&gt; refers to a network file the
-            <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
-        <param name="headers">the headers to be sent together with the request for the data.
-                   This can be <c>null</c> if no specific headers are to be sent with the
-                   request.</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="fd">the FileDescriptor for the file you want to extract from.</param>
+        <summary>Sets the data source (FileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.content.Context, android.net.Uri, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1320,27 +1295,21 @@
       </Parameters>
       <Docs>
         <param name="path">the path of the file, or the http URL of the stream
-
- <para tool="javadoc-to-mdoc" />When <c>path</c> refers to a local file, the file may actually be opened by a
- process other than the calling application.  This implies that the pathname
- should be an absolute path (as any other process runs with unspecified current working
- directory), and that the pathname should reference a world-readable file.
- As an alternative, the application could first open the file for reading,
- and then use the file descriptor form <see cref="M:Android.Media.MediaExtractor.SetDataSource(Java.IO.FileDescriptor)" />.
-</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to extract from.
             
-            &lt;p&gt;When &lt;code&gt;uri&lt;/code&gt; refers to a network file the
+            &lt;p&gt;When &lt;code&gt;path&lt;/code&gt; refers to a local file, the file may actually be opened by a
+            process other than the calling application.  This implies that the pathname
+            should be an absolute path (as any other process runs with unspecified current working
+            directory), and that the pathname should reference a world-readable file.
+            As an alternative, the application could first open the file for reading,
+            and then use the file descriptor form <c>#setDataSource(FileDescriptor)</c>.
+            
+            &lt;p&gt;When &lt;code&gt;path&lt;/code&gt; refers to a network file the
             <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
-        <param name="headers">the headers to be sent together with the request for the data.
-                   This can be <c>null</c> if no specific headers are to be sent with the
-                   request.</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <summary>Sets the data source (file-path or http URL) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.content.Context, android.net.Uri, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1377,20 +1346,18 @@
         <Parameter Name="headers" Type="System.Collections.Generic.IDictionary&lt;System.String,System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to extract from.
+        <param name="path">the path of the file, or the http URL
             
-            &lt;p&gt;When &lt;code&gt;uri&lt;/code&gt; refers to a network file the
+            &lt;p&gt;When &lt;code&gt;path&lt;/code&gt; refers to a network file the
             <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
-        <param name="headers">the headers to be sent together with the request for the data.
+        <param name="headers">the headers associated with the http request for the stream you want to play.
                    This can be <c>null</c> if no specific headers are to be sent with the
                    request.</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <summary>Sets the data source (file-path or http URL) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.content.Context, android.net.Uri, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -1476,21 +1443,12 @@
       <Docs>
         <param name="fd">the FileDescriptor for the file you want to extract from.</param>
         <param name="offset">the offset into the file where the data to be extracted starts, in bytes</param>
-        <param name="length">the length in bytes of the data to be extracted
-</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to extract from.
-            
-            &lt;p&gt;When &lt;code&gt;uri&lt;/code&gt; refers to a network file the
-            <c>android.Manifest.permission#INTERNET</c> permission is required.</param>
-        <param name="headers">the headers to be sent together with the request for the data.
-                   This can be <c>null</c> if no specific headers are to be sent with the
-                   request.</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="length">the length in bytes of the data to be extracted</param>
+        <summary>Sets the data source (FileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(android.content.Context, android.net.Uri, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaExtractor#setDataSource(java.io.FileDescriptor,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.media.MediaExtractor.setDataSource(java.io.FileDescriptor, long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/MediaFormat.xml b/docs/Mono.Android/en/Android.Media/MediaFormat.xml
index 868ccc47ec..2f3b85d40e 100644
--- a/docs/Mono.Android/en/Android.Media/MediaFormat.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaFormat.xml
@@ -89,11 +89,11 @@
       </Parameters>
       <Docs>
         <param name="other">To be added.</param>
-        <summary>Creates an empty MediaFormat</summary>
+        <summary>Create a copy of a media format object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaFormat#MediaFormat()" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.MediaFormat()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaFormat#MediaFormat(android.media.MediaFormat)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.MediaFormat(android.media.MediaFormat)</code>.</a>
             </format>
           </para>
           <para>
@@ -823,12 +823,12 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="defaultValue">To be added.</param>
-        <summary>Returns the value of a ByteBuffer key.</summary>
-        <returns>null if the key does not exist or the stored value for the key is null</returns>
+        <summary>Returns the value of a ByteBuffer key, or the default value if the key is missing.</summary>
+        <returns>defaultValue if the key does not exist or the stored value for the key is null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaFormat#getByteBuffer(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getByteBuffer(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaFormat#getByteBuffer(java.lang.String,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getByteBuffer(java.lang.String, java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -950,12 +950,12 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="defaultValue">To be added.</param>
-        <summary>Returns the value of a float key.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns the value of a float key, or the default value if the key is missing.</summary>
+        <returns>defaultValue if the key does not exist or the stored value for the key is null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaFormat#getFloat(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getFloat(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaFormat#getFloat(java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getFloat(java.lang.String, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1033,12 +1033,12 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="defaultValue">To be added.</param>
-        <summary>Returns the value of an integer key.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns the value of an integer key, or the default value if the key is missing.</summary>
+        <returns>defaultValue if the key does not exist or the stored value for the key is null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaFormat#getInteger(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getInteger(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaFormat#getInteger(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getInteger(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1116,12 +1116,12 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="defaultValue">To be added.</param>
-        <summary>Returns the value of a long key.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns the value of a long key, or the default value if the key is missing.</summary>
+        <returns>defaultValue if the key does not exist or the stored value for the key is null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaFormat#getLong(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getLong(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaFormat#getLong(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getLong(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1198,12 +1198,12 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="defaultValue">To be added.</param>
-        <summary>Returns the value of a numeric key.</summary>
-        <returns>null if the key does not exist or the stored value for the key is null</returns>
+        <summary>Returns the value of a numeric key, or the default value if the key is missing.</summary>
+        <returns>defaultValue if the key does not exist or the stored value for the key is null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaFormat#getNumber(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getNumber(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaFormat#getNumber(java.lang.String,%20java.lang.Number)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getNumber(java.lang.String, java.lang.Number)</code>.</a>
             </format>
           </para>
           <para>
@@ -1281,12 +1281,12 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="defaultValue">To be added.</param>
-        <summary>Returns the value of a string key.</summary>
-        <returns>null if the key does not exist or the stored value for the key is null</returns>
+        <summary>Returns the value of a string key, or the default value if the key is missing.</summary>
+        <returns>defaultValue if the key does not exist or the stored value for the key is null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaFormat#getString(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getString(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaFormat#getString(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaFormat.getString(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/MediaMetadataRetriever.xml b/docs/Mono.Android/en/Android.Media/MediaMetadataRetriever.xml
index 281307d54d..4fa9462543 100644
--- a/docs/Mono.Android/en/Android.Media/MediaMetadataRetriever.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaMetadataRetriever.xml
@@ -343,10 +343,10 @@
         <Parameter Name="params" Type="Android.Media.MediaMetadataRetriever+BitmapParams" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="frameIndex">0-based index of the video frame. The frame index must be that of
                    a valid frame. The total number of frames available for retrieval can be queried
                    via the <c>#METADATA_KEY_VIDEO_FRAME_COUNT</c> key.</param>
+        <param name="params">To be added.</param>
         <summary>This method is similar to <c>#getFrameAtIndex(int, BitmapParams)</c> except that
             the default for <c>BitmapParams</c> will be used.</summary>
         <returns>A Bitmap containing the requested video frame, or null if the retrieval fails.</returns>
@@ -388,18 +388,18 @@
       </Parameters>
       <Docs>
         <param name="timeUs">The time position where the frame will be retrieved.
- When retrieving the frame at the given time position, there is no
- guarentee that the data source has a frame located at the position.
- When this happens, a frame nearby will be returned. If timeUs is
- negative, time position and option will ignored, and any frame
- that the implementation considers as representative may be returned.</param>
+            When retrieving the frame at the given time position, there is no
+            guarentee that the data source has a frame located at the position.
+            When this happens, a frame nearby will be returned. If timeUs is
+            negative, time position and option will ignored, and any frame
+            that the implementation considers as representative may be returned.</param>
         <summary>Call this method after setDataSource().</summary>
-        <returns>A Bitmap containing a representative video frame, which
-                    can be null, if such a frame cannot be retrieved.</returns>
+        <returns>A Bitmap of size dst_widthxdst_height containing a representative
+                    video frame, which can be null, if such a frame cannot be retrieved.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#getFrameAtTime()" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.getFrameAtTime()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#getFrameAtTime(long)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.getFrameAtTime(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -444,29 +444,31 @@
       </Parameters>
       <Docs>
         <param name="timeUs">The time position where the frame will be retrieved.
- When retrieving the frame at the given time position, there is no
- guarantee that the data source has a frame located at the position.
- When this happens, a frame nearby will be returned. If timeUs is
- negative, time position and option will ignored, and any frame
- that the implementation considers as representative may be returned.</param>
+            When retrieving the frame at the given time position, there is no
+            guarantee that the data source has a frame located at the position.
+            When this happens, a frame nearby will be returned. If timeUs is
+            negative, time position and option will ignored, and any frame
+            that the implementation considers as representative may be returned.</param>
         <param name="option">a hint on how the frame is found. Use
- <see cref="F:Android.Media.MediaMetadataRetriever.OptionPreviousSync" /> if one wants to retrieve a sync frame
- that has a timestamp earlier than or the same as timeUs. Use
- <see cref="F:Android.Media.MediaMetadataRetriever.OptionNextSync" /> if one wants to retrieve a sync frame
- that has a timestamp later than or the same as timeUs. Use
- <see cref="F:Android.Media.MediaMetadataRetriever.OptionClosestSync" /> if one wants to retrieve a sync frame
- that has a timestamp closest to or the same as timeUs. Use
- <see cref="F:Android.Media.MediaMetadataRetriever.OptionClosest" /> if one wants to retrieve a frame that may
- or may not be a sync frame but is closest to or the same as timeUs.
- <see cref="F:Android.Media.MediaMetadataRetriever.OptionClosest" /> often has larger performance overhead compared
- to the other options if there is no sync frame located at timeUs.</param>
-        <summary>Call this method after setDataSource().</summary>
-        <returns>A Bitmap containing a representative video frame, which
-                    can be null, if such a frame cannot be retrieved.</returns>
+            <c>#OPTION_PREVIOUS_SYNC</c> if one wants to retrieve a sync frame
+            that has a timestamp earlier than or the same as timeUs. Use
+            <c>#OPTION_NEXT_SYNC</c> if one wants to retrieve a sync frame
+            that has a timestamp later than or the same as timeUs. Use
+            <c>#OPTION_CLOSEST_SYNC</c> if one wants to retrieve a sync frame
+            that has a timestamp closest to or the same as timeUs. Use
+            <c>#OPTION_CLOSEST</c> if one wants to retrieve a frame that may
+            or may not be a sync frame but is closest to or the same as timeUs.
+            <c>#OPTION_CLOSEST</c> often has larger performance overhead compared
+            to the other options if there is no sync frame located at timeUs.</param>
+        <summary>This method is similar to <c>#getFrameAtTime(long, int, BitmapParams)</c>
+            except that the device will choose the actual <c>Bitmap.Config</c> to use.</summary>
+        <returns>A Bitmap containing a representative video frame, which can be null,
+                    if such a frame cannot be retrieved. <c>Bitmap#getConfig()</c> can
+                    be used to query the actual <c>Bitmap.Config</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#getFrameAtTime()" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.getFrameAtTime()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#getFrameAtTime(long,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.getFrameAtTime(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -628,12 +630,12 @@
         <Parameter Name="params" Type="Android.Media.MediaMetadataRetriever+BitmapParams" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="frameIndex">0-based index of the first video frame to retrieve. The frame index
                    must be that of a valid frame. The total number of frames available for retrieval
                    can be queried via the <c>#METADATA_KEY_VIDEO_FRAME_COUNT</c> key.</param>
         <param name="numFrames">number of consecutive video frames to retrieve. Must be a positive
                    value. The stream must contain at least numFrames frames starting at frameIndex.</param>
+        <param name="params">To be added.</param>
         <summary>This method is similar to <c>#getFramesAtIndex(int, int, BitmapParams)</c> except that
             the default for <c>BitmapParams</c> will be used.</summary>
         <returns>An list of Bitmaps containing the requested video frames. The returned
@@ -717,8 +719,8 @@
         <Parameter Name="params" Type="Android.Media.MediaMetadataRetriever+BitmapParams" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="imageIndex">0-based index of the image.</param>
+        <param name="params">To be added.</param>
         <summary>This method is similar to <c>#getImageAtIndex(int, BitmapParams)</c> except that
             the default for <c>BitmapParams</c> will be used.</summary>
         <returns>the requested still image, or null if the image cannot be retrieved.</returns>
@@ -882,7 +884,6 @@
         <Parameter Name="params" Type="Android.Media.MediaMetadataRetriever+BitmapParams" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="timeUs">The time position in microseconds where the frame will be retrieved.
             When retrieving the frame at the given time position, there is no
             guarantee that the data source has a frame located at the position.
@@ -902,6 +903,7 @@
             to the other options if there is no sync frame located at timeUs.</param>
         <param name="dstWidth">expected output bitmap width</param>
         <param name="dstHeight">expected output bitmap height</param>
+        <param name="params">To be added.</param>
         <summary>This method is similar to <c>#getScaledFrameAtTime(long, int, int, int, BitmapParams)</c>
             except that the device will choose the actual <c>Bitmap.Config</c> to use.</summary>
         <returns>A Bitmap containing a representative video frame, which can be null,
@@ -2874,14 +2876,12 @@
         <Parameter Name="dataSource" Type="Android.Media.MediaDataSource" />
       </Parameters>
       <Docs>
-        <param name="dataSource">To be added.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="dataSource">the MediaDataSource for the media you want to play</param>
+        <summary>Sets the data source (MediaDataSource) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(android.media.MediaDataSource)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(android.media.MediaDataSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -2916,13 +2916,11 @@
       </Parameters>
       <Docs>
         <param name="fd">the FileDescriptor for the file you want to play</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <summary>Sets the data source (FileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -2959,14 +2957,13 @@
         <Parameter Name="path" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="path">The path of the input media file.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="path">The path, or the URI (doesn't support streaming source currently)
+            of the input media file.</param>
+        <summary>Sets the data source (file pathname) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3050,14 +3047,13 @@
         <Parameter Name="headers" Type="System.Collections.Generic.IDictionary&lt;System.String,System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="headers">To be added.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="uri">The URI of the input media.</param>
+        <param name="headers">the headers to be sent together with the request for the data</param>
+        <summary>Sets the data source (URI) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -3095,16 +3091,14 @@
       <Docs>
         <param name="fd">the FileDescriptor for the file you want to play</param>
         <param name="offset">the offset into the file where the data to be played starts,
- in bytes. It must be non-negative</param>
+            in bytes. It must be non-negative</param>
         <param name="length">the length in bytes of the data to be played. It must be
- non-negative.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+            non-negative.</param>
+        <summary>Sets the data source (FileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMetadataRetriever#setDataSource(java.io.FileDescriptor,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.media.MediaMetadataRetriever.setDataSource(java.io.FileDescriptor, long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/MediaMuxer.xml b/docs/Mono.Android/en/Android.Media/MediaMuxer.xml
index 01edb0d2b6..92aed0830f 100644
--- a/docs/Mono.Android/en/Android.Media/MediaMuxer.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaMuxer.xml
@@ -103,14 +103,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="fd">The FileDescriptor of the output media file.</param>
+        <param name="path">The path of the output media file.</param>
         <param name="format">The format of the output media file.</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaMuxer#MediaMuxer(java.io.FileDescriptor,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaMuxer.MediaMuxer(java.io.FileDescriptor, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaMuxer#MediaMuxer(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaMuxer.MediaMuxer(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -477,8 +476,8 @@
         <Parameter Name="bufferInfo" Type="Android.Media.MediaCodec+BufferInfo" />
       </Parameters>
       <Docs>
-        <param name="byteBuf">The encoded sample.</param>
         <param name="trackIndex">The track index for this sample.</param>
+        <param name="byteBuf">The encoded sample.</param>
         <param name="bufferInfo">The buffer information related to this sample.</param>
         <summary>Writes an encoded sample into the muxer.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Media/MediaPlayer.xml b/docs/Mono.Android/en/Android.Media/MediaPlayer.xml
index b52fb91f80..22182bf6b5 100644
--- a/docs/Mono.Android/en/Android.Media/MediaPlayer.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaPlayer.xml
@@ -175,14 +175,12 @@
       </Parameters>
       <Docs>
         <param name="fd">the FileDescriptor for the file you want to play</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
         <param name="mimeType">The mime type of the file. Must be one of the mime types listed above.</param>
-        <summary>Adds an external timed text source file (Uri).</summary>
+        <summary>Adds an external timed text source file (FileDescriptor).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#addTimedTextSource(android.content.Context,%20android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.addTimedTextSource(android.content.Context, android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#addTimedTextSource(java.io.FileDescriptor,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.addTimedTextSource(java.io.FileDescriptor, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -222,14 +220,12 @@
       </Parameters>
       <Docs>
         <param name="path">The file path of external timed text source file.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
         <param name="mimeType">The mime type of the file. Must be one of the mime types listed above.</param>
-        <summary>Adds an external timed text source file (Uri).</summary>
+        <summary>Adds an external timed text source file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#addTimedTextSource(android.content.Context,%20android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.addTimedTextSource(android.content.Context, android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#addTimedTextSource(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.addTimedTextSource(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -323,14 +319,11 @@
         <param name="offset">the offset into the file where the data to be played starts, in bytes</param>
         <param name="length">the length in bytes of the data to be played</param>
         <param name="mime">The mime type of the file. Must be one of the mime types listed above.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <param name="mimeType">The mime type of the file. Must be one of the mime types listed above.</param>
-        <summary>Adds an external timed text source file (Uri).</summary>
+        <summary>Adds an external timed text file (FileDescriptor).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#addTimedTextSource(android.content.Context,%20android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.addTimedTextSource(android.content.Context, android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#addTimedTextSource(java.io.FileDescriptor,%20long,%20long,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.addTimedTextSource(java.io.FileDescriptor, long, long, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -595,16 +588,14 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="uri">the Uri from which to get the datasource</param>
         <param name="context">the Context to use</param>
-        <param name="resid">the raw resource id (&lt;var&gt;R.raw.&amp;lt;something&gt;&lt;/var&gt;) for
-                         the resource to use as the datasource</param>
-        <summary>Convenience method to create a MediaPlayer for a given resource id.</summary>
+        <param name="uri">the Uri from which to get the datasource</param>
+        <summary>Convenience method to create a MediaPlayer for a given Uri.</summary>
         <returns>a MediaPlayer object, or null if creation failed</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -685,17 +676,15 @@
         <Parameter Name="holder" Type="Android.Views.ISurfaceHolder" />
       </Parameters>
       <Docs>
+        <param name="context">the Context to use</param>
         <param name="uri">the Uri from which to get the datasource</param>
         <param name="holder">the SurfaceHolder to use for displaying the video</param>
-        <param name="context">the Context to use</param>
-        <param name="resid">the raw resource id (&lt;var&gt;R.raw.&amp;lt;something&gt;&lt;/var&gt;) for
-                         the resource to use as the datasource</param>
-        <summary>Convenience method to create a MediaPlayer for a given resource id.</summary>
+        <summary>Convenience method to create a MediaPlayer for a given Uri.</summary>
         <returns>a MediaPlayer object, or null if creation failed</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20android.net.Uri,%20android.view.SurfaceHolder)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, android.net.Uri, android.view.SurfaceHolder)</code>.</a>
             </format>
           </para>
           <para>
@@ -733,18 +722,19 @@
         <Parameter Name="audioSessionId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="audioAttributes">the <see cref="T:Android.Media.AudioAttributes" /> to be used by the media player.</param>
-        <param name="audioSessionId">the audio session ID to be used by the media player,
-     see <see cref="M:Android.Media.AudioManager.GenerateAudioSessionId" /> to obtain a new session.</param>
         <param name="context">the Context to use</param>
         <param name="resid">the raw resource id (&lt;var&gt;R.raw.&amp;lt;something&gt;&lt;/var&gt;) for
                          the resource to use as the datasource</param>
-        <summary>Convenience method to create a MediaPlayer for a given resource id.</summary>
+        <param name="audioAttributes">the <c>AudioAttributes</c> to be used by the media player.</param>
+        <param name="audioSessionId">the audio session ID to be used by the media player,
+                see <c>AudioManager#generateAudioSessionId()</c> to obtain a new session.</param>
+        <summary>Same factory method as <c>#create(Context, int)</c> but that lets you specify the audio
+            attributes and session ID to be used by the new MediaPlayer instance.</summary>
         <returns>a MediaPlayer object, or null if creation failed</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20int,%20android.media.AudioAttributes,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, int, android.media.AudioAttributes, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -782,20 +772,19 @@
         <Parameter Name="audioSessionId" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">the Context to use</param>
         <param name="uri">the Uri from which to get the datasource</param>
         <param name="holder">the SurfaceHolder to use for displaying the video, may be null.</param>
-        <param name="audioAttributes">the <see cref="T:Android.Media.AudioAttributes" /> to be used by the media player.</param>
+        <param name="audioAttributes">the <c>AudioAttributes</c> to be used by the media player.</param>
         <param name="audioSessionId">the audio session ID to be used by the media player,
-     see <see cref="M:Android.Media.AudioManager.GenerateAudioSessionId" /> to obtain a new session.</param>
-        <param name="context">the Context to use</param>
-        <param name="resid">the raw resource id (&lt;var&gt;R.raw.&amp;lt;something&gt;&lt;/var&gt;) for
-                         the resource to use as the datasource</param>
-        <summary>Convenience method to create a MediaPlayer for a given resource id.</summary>
+                see <c>AudioManager#generateAudioSessionId()</c> to obtain a new session.</param>
+        <summary>Same factory method as <c>#create(Context, Uri, SurfaceHolder)</c> but that lets you specify
+            the audio attributes and session ID to be used by the new MediaPlayer instance.</summary>
         <returns>a MediaPlayer object, or null if creation failed</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#create(android.content.Context,%20android.net.Uri,%20android.view.SurfaceHolder,%20android.media.AudioAttributes,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.create(android.content.Context, android.net.Uri, android.view.SurfaceHolder, android.media.AudioAttributes, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2268,13 +2257,27 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
-        <param name="msec">the offset in milliseconds from the start to seek to</param>
-        <summary>Seeks to specified time position.</summary>
+        <param name="msec">the offset in milliseconds from the start to seek to.
+            When seeking to the given time position, there is no guarantee that the data source
+            has a frame located at the position. When this happens, a frame nearby will be rendered.
+            If msec is negative, time position zero will be used.
+            If msec is larger than duration, duration will be used.</param>
+        <param name="mode">the mode indicating where exactly to seek to.
+            Use <c>#SEEK_PREVIOUS_SYNC</c> if one wants to seek to a sync frame
+            that has a timestamp earlier than or the same as msec. Use
+            <c>#SEEK_NEXT_SYNC</c> if one wants to seek to a sync frame
+            that has a timestamp later than or the same as msec. Use
+            <c>#SEEK_CLOSEST_SYNC</c> if one wants to seek to a sync frame
+            that has a timestamp closest to or the same as msec. Use
+            <c>#SEEK_CLOSEST</c> if one wants to seek to a frame that may
+            or may not be a sync frame but is closest to or the same as msec.
+            <c>#SEEK_CLOSEST</c> often has larger performance overhead compared
+            to the other options if there is no sync frame located at msec.</param>
+        <summary>Moves the media to specified time position by considering the given mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#seekTo(int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.seekTo(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#seekTo(long,%20int)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.seekTo(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2484,14 +2487,12 @@
         <Parameter Name="afd" Type="Android.Content.Res.AssetFileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="afd">To be added.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="afd">the AssetFileDescriptor for the file you want to play</param>
+        <summary>Sets the data source (AssetFileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.res.AssetFileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.res.AssetFileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -2525,14 +2526,12 @@
         <Parameter Name="dataSource" Type="Android.Media.MediaDataSource" />
       </Parameters>
       <Docs>
-        <param name="dataSource">To be added.</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <param name="dataSource">the MediaDataSource for the media you want to play</param>
+        <summary>Sets the data source (MediaDataSource) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.media.MediaDataSource)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.media.MediaDataSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -2567,13 +2566,11 @@
       </Parameters>
       <Docs>
         <param name="fd">the FileDescriptor for the file you want to play</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <summary>Sets the data source (FileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -2613,13 +2610,11 @@
       </Parameters>
       <Docs>
         <param name="path">the path of the file, or the http/rtsp URL of the stream you want to play</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <summary>Sets the data source (file-path or http/rtsp URL) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2715,14 +2710,14 @@
         <Parameter Name="headers" Type="System.Collections.Generic.IDictionary&lt;System.String,System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="headers">To be added.</param>
         <param name="context">the Context to use when resolving the Uri</param>
         <param name="uri">the Content URI of the data you want to play</param>
+        <param name="headers">the headers to be sent together with the request for the data</param>
         <summary>Sets the data source as a content Uri.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -2761,13 +2756,11 @@
         <param name="fd">the FileDescriptor for the file you want to play</param>
         <param name="offset">the offset into the file where the data to be played starts, in bytes</param>
         <param name="length">the length in bytes of the data to be played</param>
-        <param name="context">the Context to use when resolving the Uri</param>
-        <param name="uri">the Content URI of the data you want to play</param>
-        <summary>Sets the data source as a content Uri.</summary>
+        <summary>Sets the data source (FileDescriptor) to use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(java.io.FileDescriptor,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(java.io.FileDescriptor, long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2809,15 +2802,16 @@
         <Parameter Name="cookies" Type="System.Collections.Generic.IList&lt;Java.Net.HttpCookie&gt;" />
       </Parameters>
       <Docs>
-        <param name="headers">To be added.</param>
-        <param name="cookies">To be added.</param>
         <param name="context">the Context to use when resolving the Uri</param>
         <param name="uri">the Content URI of the data you want to play</param>
+        <param name="headers">the headers to be sent together with the request for the data
+                           The headers must not include cookies. Instead, use the cookies param.</param>
+        <param name="cookies">the cookies to be sent together with the request</param>
         <summary>Sets the data source as a content Uri.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setDataSource(android.content.Context,%20android.net.Uri,%20java.util.Map,%20java.util.List)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setDataSource(android.content.Context, android.net.Uri, java.util.Map, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -3364,8 +3358,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">the callback that will be run</param>
+        <param name="handler">To be added.</param>
         <summary>Register a callback to be invoked when the DRM info is
             known.</summary>
         <remarks>
@@ -3445,8 +3439,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">the callback that will be run</param>
+        <param name="handler">To be added.</param>
         <summary>Register a callback to be invoked when the DRM object is prepared.</summary>
         <remarks>
           <para>
@@ -3606,8 +3600,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">the listener called after a discontinuity</param>
+        <param name="handler">To be added.</param>
         <summary>Sets the listener to be invoked when a media time discontinuity is encountered.</summary>
         <remarks>
           <para>
@@ -3768,8 +3762,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">the listener called when new data is available</param>
+        <param name="handler">To be added.</param>
         <summary>Sets the listener to be invoked when a subtitle track has new data available.</summary>
         <remarks>
           <para>
@@ -4111,11 +4105,19 @@
       </Parameters>
       <Docs>
         <param name="leftVolume">left volume scalar</param>
-        <param name="rightVolume">right volume scalar
-</param>
+        <param name="rightVolume">right volume scalar</param>
         <summary>Sets the volume on this player.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/media/MediaPlayer#setVolume(float,%20float)" title="Reference documentation">Java documentation for <code>android.media.MediaPlayer.setVolume(float, float)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Media/MediaRecorder.xml b/docs/Mono.Android/en/Android.Media/MediaRecorder.xml
index f629596832..3f27ce5525 100644
--- a/docs/Mono.Android/en/Android.Media/MediaRecorder.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaRecorder.xml
@@ -110,12 +110,12 @@
         <Parameter Name="context" Type="Android.Content.Context" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
+        <param name="context">Context the recorder belongs to</param>
         <summary>Default constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaRecorder#MediaRecorder()" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.MediaRecorder()</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaRecorder#MediaRecorder(android.content.Context)" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.MediaRecorder(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -1671,14 +1671,13 @@
         <Parameter Name="fd" Type="Java.IO.FileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="fd">To be added.</param>
-        <param name="file">The file to use.</param>
-        <summary>Sets the next output file to be used when the maximum filesize is reached on the prior
-            output <c>#setOutputFile</c> or <c>#setNextOutputFile</c>).</summary>
+        <param name="fd">an open file descriptor to be written into.</param>
+        <summary>Sets the next output file descriptor to be used when the maximum filesize is reached
+            on the prior output <c>#setOutputFile</c> or <c>#setNextOutputFile</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaRecorder#setNextOutputFile(java.io.File)" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.setNextOutputFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaRecorder#setNextOutputFile(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.setNextOutputFile(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1878,12 +1877,11 @@
       </Parameters>
       <Docs>
         <param name="fd">an open file descriptor to be written into.</param>
-        <param name="file">the file object to be written into.</param>
-        <summary>Pass in the file object to be written.</summary>
+        <summary>Pass in the file descriptor of the file to be written.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaRecorder#setOutputFile(java.io.File)" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.setOutputFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaRecorder#setOutputFile(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.setOutputFile(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1922,12 +1920,11 @@
       </Parameters>
       <Docs>
         <param name="path">The pathname to use.</param>
-        <param name="file">the file object to be written into.</param>
-        <summary>Pass in the file object to be written.</summary>
+        <summary>Sets the path of the output file to be produced.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaRecorder#setOutputFile(java.io.File)" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.setOutputFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaRecorder#setOutputFile(java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaRecorder.setOutputFile(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/MediaRouter.xml b/docs/Mono.Android/en/Android.Media/MediaRouter.xml
index be5f5b16c9..2207811818 100644
--- a/docs/Mono.Android/en/Android.Media/MediaRouter.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaRouter.xml
@@ -146,12 +146,12 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="types">Types of routes this callback is interested in</param>
+        <param name="cb">Callback to add</param>
         <param name="flags">Flags to control the behavior of the callback.
  May be zero or a combination of <see cref="F:Android.Media.MediaRouter.CallbackFlagPerformActiveScan" /> and
  <see cref="F:Android.Media.MediaRouter.CallbackFlagUnfilteredEvents" />.
 </param>
-        <param name="types">Types of routes this callback is interested in</param>
-        <param name="cb">Callback to add</param>
         <summary>Add a callback to listen to events about specific kinds of media routes.</summary>
         <remarks>
           <para>
@@ -394,7 +394,6 @@
       </Parameters>
       <Docs>
         <param name="name">Name of the new category</param>
-        <param name="nameResId">Resource ID of the name of the new category</param>
         <param name="isGroupable">true if routes in this category may be grouped with one another</param>
         <summary>Create a new route category.</summary>
         <returns>the new RouteCategory</returns>
@@ -475,7 +474,6 @@
       </Parameters>
       <Docs>
         <param name="name">To be added.</param>
-        <param name="nameResId">Resource ID of the name of the new category</param>
         <param name="isGroupable">true if routes in this category may be grouped with one another</param>
         <summary>Create a new route category.</summary>
         <returns>the new RouteCategory</returns>
diff --git a/docs/Mono.Android/en/Android.Media/MediaScannerConnection.xml b/docs/Mono.Android/en/Android.Media/MediaScannerConnection.xml
index 8558a7ddce..86f79e14f2 100644
--- a/docs/Mono.Android/en/Android.Media/MediaScannerConnection.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaScannerConnection.xml
@@ -376,26 +376,12 @@
       <Docs>
         <param name="path">the path to the file to be scanned.</param>
         <param name="mimeType">an optional mimeType for the file.
- If mimeType is null, then the mimeType will be inferred from the file extension.
-</param>
-        <param name="context">The caller's Context, required for establishing a connection to
-            the media scanner service.
-            Success or failure of the scanning operation cannot be determined until
-            <c>MediaScannerConnectionClient#onScanCompleted(String, Uri)</c> is called.</param>
-        <param name="paths">Array of paths to be scanned.</param>
-        <param name="mimeTypes">Optional array of MIME types for each path.
             If mimeType is null, then the mimeType will be inferred from the file extension.</param>
-        <param name="callback">Optional callback through which you can receive the
-            scanned URI and MIME type; If null, the file will be scanned but
-            you will not get a result back.</param>
-        <summary>Convenience for constructing a <c>MediaScannerConnection</c>, calling
-            <c>#connect</c> on it, and calling <c>#scanFile(String, String)</c> with the given
-            &lt;var&gt;path&lt;/var&gt; and &lt;var&gt;mimeType&lt;/var&gt; when the connection is
-            established.</summary>
+        <summary>Requests the media scanner to scan a file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/MediaScannerConnection#scanFile(android.content.Context,%20java.lang.String[],%20java.lang.String[],%20android.media.OnScanCompletedListener)" title="Reference documentation">Java documentation for <code>android.media.MediaScannerConnection.scanFile(android.content.Context, java.lang.String[], java.lang.String[], android.media.OnScanCompletedListener)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/MediaScannerConnection#scanFile(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.MediaScannerConnection.scanFile(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/MediaTimestamp.xml b/docs/Mono.Android/en/Android.Media/MediaTimestamp.xml
index d6456f9aa1..fe9a0d8d28 100644
--- a/docs/Mono.Android/en/Android.Media/MediaTimestamp.xml
+++ b/docs/Mono.Android/en/Android.Media/MediaTimestamp.xml
@@ -56,11 +56,23 @@
         <Parameter Name="clockRate" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="mediaTimeUs">To be added.</param>
-        <param name="nanoTimeNs">To be added.</param>
-        <param name="clockRate">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="mediaTimeUs">the media time of the anchor in microseconds</param>
+        <param name="nanoTimeNs">the <c>java.lang.System#nanoTime system time</c> corresponding to the
+                             media time in nanoseconds.</param>
+        <param name="clockRate">the rate of the media clock in relation to the system time.</param>
+        <summary>Constructor.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/media/MediaTimestamp#MediaTimestamp(long,%20long,%20float)" title="Reference documentation">Java documentation for <code>android.media.MediaTimestamp.MediaTimestamp(long, long, float)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="AnchorMediaTimeUs">
diff --git a/docs/Mono.Android/en/Android.Media/RemoteControlClient.xml b/docs/Mono.Android/en/Android.Media/RemoteControlClient.xml
index 82e7e27280..e49c33950c 100644
--- a/docs/Mono.Android/en/Android.Media/RemoteControlClient.xml
+++ b/docs/Mono.Android/en/Android.Media/RemoteControlClient.xml
@@ -114,7 +114,6 @@
         <Parameter Name="looper" Type="Android.OS.Looper" />
       </Parameters>
       <Docs>
-        <param name="looper">To be added.</param>
         <param name="mediaButtonIntent">The intent that will be sent for the media button events sent
                 by remote controls.
                 This intent needs to have been constructed with the <c>Intent#ACTION_MEDIA_BUTTON</c>
@@ -123,11 +122,13 @@
                 <c>AudioManager#registerMediaButtonEventReceiver(ComponentName)</c>
                 before this new RemoteControlClient can itself be registered with
                 <c>AudioManager#registerRemoteControlClient(RemoteControlClient)</c>.</param>
-        <summary>Class constructor.</summary>
+        <param name="looper">The Looper running the event loop.</param>
+        <summary>Class constructor for a remote control client whose internal event handling
+            happens on a user-provided Looper.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/RemoteControlClient#RemoteControlClient(android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.media.RemoteControlClient.RemoteControlClient(android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/RemoteControlClient#RemoteControlClient(android.app.PendingIntent,%20android.os.Looper)" title="Reference documentation">Java documentation for <code>android.media.RemoteControlClient.RemoteControlClient(android.app.PendingIntent, android.os.Looper)</code>.</a>
             </format>
           </para>
           <para>
@@ -1376,16 +1377,6 @@
         <Parameter Name="playbackSpeed" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="timeInMs">a 0 or positive value for the current media position expressed in ms
-    (same unit as for when sending the media duration, if applicable, with
-    <see cref="F:Android.Media.MediaMetadataRetriever.MetadataKeyDuration" /> in the
-    <see cref="T:Android.Media.RemoteControlClient.MetadataEditor" />). Negative values imply that position is not
-    known (e.g. listening to a live stream of a radio) or not applicable (e.g. when state
-    is <see cref="F:Android.Media.RemoteControlClient.PlaystateBuffering" /> and nothing had played yet).</param>
-        <param name="playbackSpeed">a value expressed as a ratio of 1x playback: 1.0f is normal playback,
-    2.0f is 2x, 0.5f is half-speed, -2.0f is rewind at 2x speed. 0.0f means nothing is
-    playing (e.g. when state is <see cref="F:Android.Media.RemoteControlClient.PlaystateError" />).
-</param>
         <param name="state">The current playback state, one of the following values:
                   <c>#PLAYSTATE_STOPPED</c>,
                   <c>#PLAYSTATE_PAUSED</c>,
@@ -1396,11 +1387,21 @@
                   <c>#PLAYSTATE_SKIPPING_BACKWARDS</c>,
                   <c>#PLAYSTATE_BUFFERING</c>,
                   <c>#PLAYSTATE_ERROR</c>.</param>
-        <summary>Sets the current playback state.</summary>
+        <param name="timeInMs">a 0 or positive value for the current media position expressed in ms
+               (same unit as for when sending the media duration, if applicable, with
+               <c>android.media.MediaMetadataRetriever#METADATA_KEY_DURATION</c> in the
+               <c>RemoteControlClient.MetadataEditor</c>). Negative values imply that position is not
+               known (e.g. listening to a live stream of a radio) or not applicable (e.g. when state
+               is <c>#PLAYSTATE_BUFFERING</c> and nothing had played yet).</param>
+        <param name="playbackSpeed">a value expressed as a ratio of 1x playback: 1.0f is normal playback,
+               2.0f is 2x, 0.5f is half-speed, -2.0f is rewind at 2x speed. 0.0f means nothing is
+               playing (e.g. when state is <c>#PLAYSTATE_ERROR</c>).</param>
+        <summary>Sets the current playback state and the matching media position for the current playback
+              speed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/RemoteControlClient#setPlaybackState(int)" title="Reference documentation">Java documentation for <code>android.media.RemoteControlClient.setPlaybackState(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/RemoteControlClient#setPlaybackState(int,%20long,%20float)" title="Reference documentation">Java documentation for <code>android.media.RemoteControlClient.setPlaybackState(int, long, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/RingtoneManager.xml b/docs/Mono.Android/en/Android.Media/RingtoneManager.xml
index b33ea9c503..45f3382d75 100644
--- a/docs/Mono.Android/en/Android.Media/RingtoneManager.xml
+++ b/docs/Mono.Android/en/Android.Media/RingtoneManager.xml
@@ -92,13 +92,12 @@
         <Parameter Name="context" Type="Android.Content.Context" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="activity">The activity used to get a managed cursor.</param>
+        <param name="context">The context to used to get a cursor.</param>
         <summary>Constructs a RingtoneManager.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/RingtoneManager#RingtoneManager(android.app.Activity)" title="Reference documentation">Java documentation for <code>android.media.RingtoneManager.RingtoneManager(android.app.Activity)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/RingtoneManager#RingtoneManager(android.content.Context)" title="Reference documentation">Java documentation for <code>android.media.RingtoneManager.RingtoneManager(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -720,15 +719,13 @@
       </Parameters>
       <Docs>
         <param name="context">A context used to query.</param>
-        <param name="ringtoneUri">The <see cref="T:Android.Net.Uri" /> of a sound or ringtone.</param>
-        <param name="position">The position (in the <c>Cursor</c>) of the ringtone.</param>
-        <summary>Gets a <c>Ringtone</c> for the ringtone at the given position in the
-            <c>Cursor</c>.</summary>
-        <returns>A <c>Ringtone</c> pointing to the ringtone.</returns>
+        <param name="ringtoneUri">The <c>Uri</c> of a sound or ringtone.</param>
+        <summary>Returns a <c>Ringtone</c> for a given sound URI.</summary>
+        <returns>A <c>Ringtone</c> for the given URI, or null.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/RingtoneManager#getRingtone(int)" title="Reference documentation">Java documentation for <code>android.media.RingtoneManager.getRingtone(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/RingtoneManager#getRingtone(android.content.Context,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.RingtoneManager.getRingtone(android.content.Context, android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
@@ -886,15 +883,14 @@
         <Parameter Name="ringtoneUri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="ringtoneUri">To be added.</param>
-        <param name="position">The position (in the <c>Cursor</c>) of the ringtone.</param>
-        <summary>Returns if the <c>Ringtone</c> at the given position in the
-            <c>Cursor</c> contains haptic channels.</summary>
+        <param name="ringtoneUri">The <c>Uri</c> of a sound or ringtone.</param>
+        <summary>Returns if the <c>Ringtone</c> from a given sound URI contains
+            haptic channels or not.</summary>
         <returns>true if the ringtone contains haptic channels.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/RingtoneManager#hasHapticChannels(int)" title="Reference documentation">Java documentation for <code>android.media.RingtoneManager.hasHapticChannels(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/RingtoneManager#hasHapticChannels(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.media.RingtoneManager.hasHapticChannels(android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/Session2Command.xml b/docs/Mono.Android/en/Android.Media/Session2Command.xml
index 079fc8b7a6..a7ed04b7d1 100644
--- a/docs/Mono.Android/en/Android.Media/Session2Command.xml
+++ b/docs/Mono.Android/en/Android.Media/Session2Command.xml
@@ -103,14 +103,13 @@
         <Parameter Name="extras" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <param name="extras">To be added.</param>
-        <param name="commandCode">A command code for a command predefined in AndroidX media2.</param>
-        <summary>Constructor for creating a command predefined in AndroidX media2.</summary>
+        <param name="action">The action of this custom command.</param>
+        <param name="extras">An extra bundle for this custom command.</param>
+        <summary>Constructor for creating a custom command.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/Session2Command#Session2Command(int)" title="Reference documentation">Java documentation for <code>android.media.Session2Command.Session2Command(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/Session2Command#Session2Command(java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.media.Session2Command.Session2Command(java.lang.String, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/Session2CommandGroup.xml b/docs/Mono.Android/en/Android.Media/Session2CommandGroup.xml
index 7dc1c2a6c2..01f2533316 100644
--- a/docs/Mono.Android/en/Android.Media/Session2CommandGroup.xml
+++ b/docs/Mono.Android/en/Android.Media/Session2CommandGroup.xml
@@ -159,15 +159,13 @@
         <Parameter Name="command" Type="Android.Media.Session2Command" />
       </Parameters>
       <Docs>
-        <param name="command">To be added.</param>
-        <param name="commandCode">A command code to find.
-                               Shouldn't be <c>Session2Command#COMMAND_CODE_CUSTOM</c>.</param>
-        <summary>Checks whether this command group has a command that matches given <c>commandCode</c>.</summary>
+        <param name="command">A command to find. Shouldn't be <c>null</c>.</param>
+        <summary>Checks whether this command group has a command that matches given <c>command</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/Session2CommandGroup#hasCommand(int)" title="Reference documentation">Java documentation for <code>android.media.Session2CommandGroup.hasCommand(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/Session2CommandGroup#hasCommand(android.media.Session2Command)" title="Reference documentation">Java documentation for <code>android.media.Session2CommandGroup.hasCommand(android.media.Session2Command)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/SoundPool.xml b/docs/Mono.Android/en/Android.Media/SoundPool.xml
index 56761b0524..9ba07ebee3 100644
--- a/docs/Mono.Android/en/Android.Media/SoundPool.xml
+++ b/docs/Mono.Android/en/Android.Media/SoundPool.xml
@@ -244,16 +244,14 @@
       </Parameters>
       <Docs>
         <param name="afd">an asset file descriptor</param>
-        <param name="context">the application context</param>
-        <param name="resId">the resource ID</param>
         <param name="priority">the priority of the sound. Currently has no effect. Use
                             a value of 1 for future compatibility.</param>
-        <summary>Load the sound from the specified APK resource.</summary>
+        <summary>Load the sound from an asset file descriptor.</summary>
         <returns>a sound ID. This value can be used to play or unload the sound.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/SoundPool#load(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.SoundPool.load(android.content.Context, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/SoundPool#load(android.content.res.AssetFileDescriptor,%20int)" title="Reference documentation">Java documentation for <code>android.media.SoundPool.load(android.content.res.AssetFileDescriptor, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -290,16 +288,14 @@
       </Parameters>
       <Docs>
         <param name="path">the path to the audio file</param>
-        <param name="context">the application context</param>
-        <param name="resId">the resource ID</param>
         <param name="priority">the priority of the sound. Currently has no effect. Use
                             a value of 1 for future compatibility.</param>
-        <summary>Load the sound from the specified APK resource.</summary>
+        <summary>Load the sound from the specified path.</summary>
         <returns>a sound ID. This value can be used to play or unload the sound.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/SoundPool#load(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.SoundPool.load(android.content.Context, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/SoundPool#load(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.SoundPool.load(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -386,16 +382,14 @@
         <param name="fd">a FileDescriptor object</param>
         <param name="offset">offset to the start of the sound</param>
         <param name="length">length of the sound</param>
-        <param name="context">the application context</param>
-        <param name="resId">the resource ID</param>
         <param name="priority">the priority of the sound. Currently has no effect. Use
                             a value of 1 for future compatibility.</param>
-        <summary>Load the sound from the specified APK resource.</summary>
+        <summary>Load the sound from a FileDescriptor.</summary>
         <returns>a sound ID. This value can be used to play or unload the sound.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/SoundPool#load(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.SoundPool.load(android.content.Context, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/SoundPool#load(java.io.FileDescriptor,%20long,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.media.SoundPool.load(java.io.FileDescriptor, long, long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -902,11 +896,19 @@
       <Docs>
         <param name="streamID">a streamID returned by the play() function</param>
         <param name="leftVolume">left volume value (range = 0.0 to 1.0)</param>
-        <param name="rightVolume">right volume value (range = 0.0 to 1.0)
-</param>
+        <param name="rightVolume">right volume value (range = 0.0 to 1.0)</param>
         <summary>Set stream volume.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/media/SoundPool#setVolume(int,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.media.SoundPool.setVolume(int, float, float)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Media/ThumbnailUtils.xml b/docs/Mono.Android/en/Android.Media/ThumbnailUtils.xml
index 86f68c475b..efa1b1affe 100644
--- a/docs/Mono.Android/en/Android.Media/ThumbnailUtils.xml
+++ b/docs/Mono.Android/en/Android.Media/ThumbnailUtils.xml
@@ -117,16 +117,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="filePath">To be added.</param>
-        <param name="kind">To be added.</param>
-        <param name="file">The audio file.</param>
-        <param name="size">The desired thumbnail size.</param>
+        <param name="filePath">The audio file.</param>
+        <param name="kind">The desired thumbnail kind, such as
+                       <c>android.provider.MediaStore.Images.Thumbnails#MINI_KIND</c>.</param>
         <summary>Create a thumbnail for given audio file.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#createAudioThumbnail(java.io.File,%20android.util.Size,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.createAudioThumbnail(java.io.File, android.util.Size, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#createAudioThumbnail(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.createAudioThumbnail(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -216,16 +215,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="filePath">To be added.</param>
-        <param name="kind">To be added.</param>
-        <param name="file">The audio file.</param>
-        <param name="size">The desired thumbnail size.</param>
+        <param name="filePath">The image file.</param>
+        <param name="kind">The desired thumbnail kind, such as
+                       <c>android.provider.MediaStore.Images.Thumbnails#MINI_KIND</c>.</param>
         <summary>Create a thumbnail for given image file.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#createImageThumbnail(java.io.File,%20android.util.Size,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.createImageThumbnail(java.io.File, android.util.Size, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#createImageThumbnail(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.createImageThumbnail(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -315,17 +313,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="filePath">the path of video file</param>
-        <param name="kind">could be MINI_KIND or MICRO_KIND
-</param>
-        <param name="file">The video file.</param>
-        <param name="size">The desired thumbnail size.</param>
+        <param name="filePath">The video file.</param>
+        <param name="kind">The desired thumbnail kind, such as
+                       <c>android.provider.MediaStore.Images.Thumbnails#MINI_KIND</c>.</param>
         <summary>Create a thumbnail for given video file.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#createVideoThumbnail(java.io.File,%20android.util.Size,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.createVideoThumbnail(java.io.File, android.util.Size, android.os.CancellationSignal)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#createVideoThumbnail(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.createVideoThumbnail(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -520,17 +516,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="options">options used during thumbnail extraction
-</param>
         <param name="source">original bitmap source</param>
         <param name="width">targeted width</param>
         <param name="height">targeted height</param>
+        <param name="options">options used during thumbnail extraction</param>
         <summary>Creates a centered bitmap of the desired size.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#extractThumbnail(android.graphics.Bitmap,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.extractThumbnail(android.graphics.Bitmap, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ThumbnailUtils#extractThumbnail(android.graphics.Bitmap,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.ThumbnailUtils.extractThumbnail(android.graphics.Bitmap, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/ToneGenerator.xml b/docs/Mono.Android/en/Android.Media/ToneGenerator.xml
index ef2a84482d..557ac027b4 100644
--- a/docs/Mono.Android/en/Android.Media/ToneGenerator.xml
+++ b/docs/Mono.Android/en/Android.Media/ToneGenerator.xml
@@ -320,19 +320,16 @@
         <Parameter Name="durationMs" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="toneType">The type of tone generated</param>
         <param name="durationMs">The tone duration in milliseconds. If the tone is limited in time by definition,
- the actual duration will be the minimum of durationMs and the defined tone duration. Setting durationMs to -1,
- is equivalent to calling <see cref="M:Android.Media.ToneGenerator.StartTone(Android.Media.Tone)" />.
-</param>
-        <param name="toneType">The type of tone generated chosen from the following list:
-            &lt;ul&gt;
-            &lt;li&gt;<c>#TONE_DTMF_0</c>&lt;li&gt;<c>#TONE_DTMF_1</c>&lt;li&gt;<c>#TONE_DTMF_2</c>&lt;li&gt;<c>#TONE_DTMF_3</c>&lt;li&gt;<c>#TONE_DTMF_4</c>&lt;li&gt;<c>#TONE_DTMF_5</c>&lt;li&gt;<c>#TONE_DTMF_6</c>&lt;li&gt;<c>#TONE_DTMF_7</c>&lt;li&gt;<c>#TONE_DTMF_8</c>&lt;li&gt;<c>#TONE_DTMF_9</c>&lt;li&gt;<c>#TONE_DTMF_A</c>&lt;li&gt;<c>#TONE_DTMF_B</c>&lt;li&gt;<c>#TONE_DTMF_C</c>&lt;li&gt;<c>#TONE_DTMF_D</c>&lt;li&gt;<c>#TONE_SUP_DIAL</c>&lt;li&gt;<c>#TONE_SUP_BUSY</c>&lt;li&gt;<c>#TONE_SUP_CONGESTION</c>&lt;li&gt;<c>#TONE_SUP_RADIO_ACK</c>&lt;li&gt;<c>#TONE_SUP_RADIO_NOTAVAIL</c>&lt;li&gt;<c>#TONE_SUP_ERROR</c>&lt;li&gt;<c>#TONE_SUP_CALL_WAITING</c>&lt;li&gt;<c>#TONE_SUP_RINGTONE</c>&lt;li&gt;<c>#TONE_PROP_BEEP</c>&lt;li&gt;<c>#TONE_PROP_ACK</c>&lt;li&gt;<c>#TONE_PROP_NACK</c>&lt;li&gt;<c>#TONE_PROP_PROMPT</c>&lt;li&gt;<c>#TONE_PROP_BEEP2</c>&lt;li&gt;<c>#TONE_SUP_INTERCEPT</c>&lt;li&gt;<c>#TONE_SUP_INTERCEPT_ABBREV</c>&lt;li&gt;<c>#TONE_SUP_CONGESTION_ABBREV</c>&lt;li&gt;<c>#TONE_SUP_CONFIRM</c>&lt;li&gt;<c>#TONE_SUP_PIP</c>&lt;li&gt;<c>#TONE_CDMA_DIAL_TONE_LITE</c>&lt;li&gt;<c>#TONE_CDMA_NETWORK_USA_RINGBACK</c>&lt;li&gt;<c>#TONE_CDMA_INTERCEPT</c>&lt;li&gt;<c>#TONE_CDMA_ABBR_INTERCEPT</c>&lt;li&gt;<c>#TONE_CDMA_REORDER</c>&lt;li&gt;<c>#TONE_CDMA_ABBR_REORDER</c>&lt;li&gt;<c>#TONE_CDMA_NETWORK_BUSY</c>&lt;li&gt;<c>#TONE_CDMA_CONFIRM</c>&lt;li&gt;<c>#TONE_CDMA_ANSWER</c>&lt;li&gt;<c>#TONE_CDMA_NETWORK_CALLWAITING</c>&lt;li&gt;<c>#TONE_CDMA_PIP</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_NORMAL</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_PAT3</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_PAT5</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_PAT6</c>&lt;li&gt;<c>#TONE_CDMA_CALL_SIGNAL_ISDN_PAT7</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_L</c>&lt;li&gt;<c>#TONE_CDMA_MED_L</c>&lt;li&gt;<c>#TONE_CDMA_LOW_L</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_SS</c>&lt;li&gt;<c>#TONE_CDMA_MED_SS</c>&lt;li&gt;<c>#TONE_CDMA_LOW_SS</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_SSL</c>&lt;li&gt;<c>#TONE_CDMA_MED_SSL</c>&lt;li&gt;<c>#TONE_CDMA_LOW_SSL</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_SS_2</c>&lt;li&gt;<c>#TONE_CDMA_MED_SS_2</c>&lt;li&gt;<c>#TONE_CDMA_LOW_SS_2</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_SLS</c>&lt;li&gt;<c>#TONE_CDMA_MED_SLS</c>&lt;li&gt;<c>#TONE_CDMA_LOW_SLS</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_S_X4</c>&lt;li&gt;<c>#TONE_CDMA_MED_S_X4</c>&lt;li&gt;<c>#TONE_CDMA_LOW_S_X4</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_PBX_L</c>&lt;li&gt;<c>#TONE_CDMA_MED_PBX_L</c>&lt;li&gt;<c>#TONE_CDMA_LOW_PBX_L</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_PBX_SS</c>&lt;li&gt;<c>#TONE_CDMA_MED_PBX_SS</c>&lt;li&gt;<c>#TONE_CDMA_LOW_PBX_SS</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_PBX_SSL</c>&lt;li&gt;<c>#TONE_CDMA_MED_PBX_SSL</c>&lt;li&gt;<c>#TONE_CDMA_LOW_PBX_SSL</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_PBX_SLS</c>&lt;li&gt;<c>#TONE_CDMA_MED_PBX_SLS</c>&lt;li&gt;<c>#TONE_CDMA_LOW_PBX_SLS</c>&lt;li&gt;<c>#TONE_CDMA_HIGH_PBX_S_X4</c>&lt;li&gt;<c>#TONE_CDMA_MED_PBX_S_X4</c>&lt;li&gt;<c>#TONE_CDMA_LOW_PBX_S_X4</c>&lt;li&gt;<c>#TONE_CDMA_ALERT_NETWORK_LITE</c>&lt;li&gt;<c>#TONE_CDMA_ALERT_AUTOREDIAL_LITE</c>&lt;li&gt;<c>#TONE_CDMA_ONE_MIN_BEEP</c>&lt;li&gt;<c>#TONE_CDMA_KEYPAD_VOLUME_KEY_LITE</c>&lt;li&gt;<c>#TONE_CDMA_PRESSHOLDKEY_LITE</c>&lt;li&gt;<c>#TONE_CDMA_ALERT_INCALL_LITE</c>&lt;li&gt;<c>#TONE_CDMA_EMERGENCY_RINGBACK</c>&lt;li&gt;<c>#TONE_CDMA_ALERT_CALL_GUARD</c>&lt;li&gt;<c>#TONE_CDMA_SOFT_ERROR_LITE</c>&lt;li&gt;<c>#TONE_CDMA_CALLDROP_LITE</c>&lt;li&gt;<c>#TONE_CDMA_NETWORK_BUSY_ONE_SHOT</c>&lt;li&gt;<c>#TONE_CDMA_ABBR_ALERT</c>&lt;li&gt;<c>#TONE_CDMA_SIGNAL_OFF</c>&lt;/ul&gt;</param>
-        <summary>This method starts the playback of a tone of the specified type.</summary>
+            the actual duration will be the minimum of durationMs and the defined tone duration. Setting durationMs to -1,
+            is equivalent to calling <c>#startTone(int)</c>.</param>
+        <summary>This method starts the playback of a tone of the specified type for the specified duration.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/ToneGenerator#startTone(int)" title="Reference documentation">Java documentation for <code>android.media.ToneGenerator.startTone(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/ToneGenerator#startTone(int,%20int)" title="Reference documentation">Java documentation for <code>android.media.ToneGenerator.startTone(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Media/VolumeProvider.xml b/docs/Mono.Android/en/Android.Media/VolumeProvider.xml
index 12833edbca..bd9b9c41a2 100644
--- a/docs/Mono.Android/en/Android.Media/VolumeProvider.xml
+++ b/docs/Mono.Android/en/Android.Media/VolumeProvider.xml
@@ -134,16 +134,16 @@
         <Parameter Name="volumeControlId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="volumeControlId">To be added.</param>
         <param name="volumeControl">The method for controlling volume that is used by
                        this provider.</param>
         <param name="maxVolume">The maximum allowed volume.</param>
         <param name="currentVolume">The current volume on the output.</param>
+        <param name="volumeControlId">The volume control ID of this provider.</param>
         <summary>Create a new volume provider for handling volume events.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/media/VolumeProvider#VolumeProvider(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.media.VolumeProvider.VolumeProvider(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/media/VolumeProvider#VolumeProvider(int,%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.media.VolumeProvider.VolumeProvider(int, int, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Mtp/MtpDevice.xml b/docs/Mono.Android/en/Android.Mtp/MtpDevice.xml
index 3ab6fe5ffc..2109a95333 100644
--- a/docs/Mono.Android/en/Android.Mtp/MtpDevice.xml
+++ b/docs/Mono.Android/en/Android.Mtp/MtpDevice.xml
@@ -841,17 +841,16 @@
         <Parameter Name="destPath" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="destPath">path to destination for the file transfer.
-      This path should be in the external storage as defined by
-      <see cref="P:Android.OS.Environment.ExternalStorageDirectory" /></param>
         <param name="objectHandle">handle of the object to read</param>
-        <param name="descriptor">file descriptor to write the data to for the file transfer.</param>
-        <summary>Copies the data for an object to a file descriptor.</summary>
+        <param name="destPath">path to destination for the file transfer.
+                 This path should be in the external storage as defined by
+                 <c>android.os.Environment#getExternalStorageDirectory</c></param>
+        <summary>Copies the data for an object to a file in external storage.</summary>
         <returns>true if the file transfer succeeds</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/mtp/MtpDevice#importFile(int,%20android.os.ParcelFileDescriptor)" title="Reference documentation">Java documentation for <code>android.mtp.MtpDevice.importFile(int, android.os.ParcelFileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/mtp/MtpDevice#importFile(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.mtp.MtpDevice.importFile(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net.Http/SslCertificate.xml b/docs/Mono.Android/en/Android.Net.Http/SslCertificate.xml
index 8c16124591..489af0ed30 100644
--- a/docs/Mono.Android/en/Android.Net.Http/SslCertificate.xml
+++ b/docs/Mono.Android/en/Android.Net.Http/SslCertificate.xml
@@ -54,18 +54,12 @@
         <Parameter Name="certificate" Type="Java.Security.Cert.X509Certificate" />
       </Parameters>
       <Docs>
-        <param name="certificate">To be added.</param>
-        <param name="issuedTo">The entity this certificate is issued to</param>
-        <param name="issuedBy">The entity that issued this certificate</param>
-        <param name="validNotBefore">The not-before date from the certificate
-                validity period in ISO 8601 format</param>
-        <param name="validNotAfter">The not-after date from the certificate
-                validity period in ISO 8601 format</param>
-        <summary>Creates a new SSL certificate object</summary>
+        <param name="certificate">X509 certificate</param>
+        <summary>Creates a new SSL certificate object from an X509 certificate</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/http/SslCertificate#SslCertificate(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.net.http.SslCertificate.SslCertificate(java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/http/SslCertificate#SslCertificate(java.security.cert.X509Certificate)" title="Reference documentation">Java documentation for <code>android.net.http.SslCertificate.SslCertificate(java.security.cert.X509Certificate)</code>.</a>
             </format>
           </para>
           <para>
@@ -129,15 +123,13 @@
       <Docs>
         <param name="issuedTo">The entity this certificate is issued to</param>
         <param name="issuedBy">The entity that issued this certificate</param>
-        <param name="validNotBefore">The not-before date from the certificate
-                validity period in ISO 8601 format</param>
-        <param name="validNotAfter">The not-after date from the certificate
-                validity period in ISO 8601 format</param>
+        <param name="validNotBefore">The not-before date from the certificate validity period</param>
+        <param name="validNotAfter">The not-after date from the certificate validity period</param>
         <summary>Creates a new SSL certificate object</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/http/SslCertificate#SslCertificate(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.net.http.SslCertificate.SslCertificate(java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/http/SslCertificate#SslCertificate(java.lang.String,%20java.lang.String,%20java.util.Date,%20java.util.Date)" title="Reference documentation">Java documentation for <code>android.net.http.SslCertificate.SslCertificate(java.lang.String, java.lang.String, java.util.Date, java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net.Http/SslError.xml b/docs/Mono.Android/en/Android.Net.Http/SslError.xml
index db74e321fb..54d9d12e3d 100644
--- a/docs/Mono.Android/en/Android.Net.Http/SslError.xml
+++ b/docs/Mono.Android/en/Android.Net.Http/SslError.xml
@@ -123,7 +123,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/http/SslError#SslError(int,%20android.net.http.SslCertificate)" title="Reference documentation">Java documentation for <code>android.net.http.SslError.SslError(int, android.net.http.SslCertificate)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/http/SslError#SslError(int,%20java.security.cert.X509Certificate)" title="Reference documentation">Java documentation for <code>android.net.http.SslError.SslError(int, java.security.cert.X509Certificate)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,14 +187,15 @@
         <Parameter Name="url" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="url">To be added.</param>
         <param name="error">The SSL error</param>
         <param name="certificate">The associated SSL certificate</param>
-        <summary>Creates a new SslError object using the supplied error and certificate.</summary>
+        <param name="url">The associated URL</param>
+        <summary>Creates a new SslError object using the supplied error, certificate and
+            URL.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/http/SslError#SslError(int,%20android.net.http.SslCertificate)" title="Reference documentation">Java documentation for <code>android.net.http.SslError.SslError(int, android.net.http.SslCertificate)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/http/SslError#SslError(int,%20android.net.http.SslCertificate,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.net.http.SslError.SslError(int, android.net.http.SslCertificate, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -235,14 +236,15 @@
         <Parameter Name="url" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="url">To be added.</param>
         <param name="error">The SSL error</param>
         <param name="certificate">The associated SSL certificate</param>
-        <summary>Creates a new SslError object using the supplied error and certificate.</summary>
+        <param name="url">The associated URL</param>
+        <summary>Creates a new SslError object using the supplied error, certificate and
+            URL.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/http/SslError#SslError(int,%20android.net.http.SslCertificate)" title="Reference documentation">Java documentation for <code>android.net.http.SslError.SslError(int, android.net.http.SslCertificate)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/http/SslError#SslError(int,%20java.security.cert.X509Certificate,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.net.http.SslError.SslError(int, java.security.cert.X509Certificate, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net.Rtp/AudioGroup.xml b/docs/Mono.Android/en/Android.Net.Rtp/AudioGroup.xml
index 54bd387205..684aaffa55 100644
--- a/docs/Mono.Android/en/Android.Net.Rtp/AudioGroup.xml
+++ b/docs/Mono.Android/en/Android.Net.Rtp/AudioGroup.xml
@@ -100,12 +100,12 @@
         <Parameter Name="context" Type="Android.Content.Context" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
+        <param name="context">Context the group belongs to</param>
         <summary>Creates an empty AudioGroup.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/rtp/AudioGroup#AudioGroup()" title="Reference documentation">Java documentation for <code>android.net.rtp.AudioGroup.AudioGroup()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/rtp/AudioGroup#AudioGroup(android.content.Context)" title="Reference documentation">Java documentation for <code>android.net.rtp.AudioGroup.AudioGroup(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net.Sip/SipAudioCall.xml b/docs/Mono.Android/en/Android.Net.Sip/SipAudioCall.xml
index d25f7a2ba8..9ea5082f54 100644
--- a/docs/Mono.Android/en/Android.Net.Sip/SipAudioCall.xml
+++ b/docs/Mono.Android/en/Android.Net.Sip/SipAudioCall.xml
@@ -740,15 +740,14 @@
         <Parameter Name="result" Type="Android.OS.Message" />
       </Parameters>
       <Docs>
-        <param name="result">the result message to send when done
-</param>
         <param name="code">the DTMF code to send. Value 0 to 15 (inclusive) are valid
                    inputs.</param>
+        <param name="result">the result message to send when done</param>
         <summary>Sends a DTMF code.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/sip/SipAudioCall#sendDtmf(int)" title="Reference documentation">Java documentation for <code>android.net.sip.SipAudioCall.sendDtmf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/sip/SipAudioCall#sendDtmf(int,%20android.os.Message)" title="Reference documentation">Java documentation for <code>android.net.sip.SipAudioCall.sendDtmf(int, android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -833,10 +832,10 @@
         <Parameter Name="callbackImmediately" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="listener">to listen to the audio call events of this object</param>
         <param name="callbackImmediately">set to true if the caller wants to be called
       back immediately on the current state
 </param>
-        <param name="listener">to listen to the audio call events of this object</param>
         <summary>Sets the listener to listen to the audio call events.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net.Sip/SipManager.xml b/docs/Mono.Android/en/Android.Net.Sip/SipManager.xml
index 55cdbe1385..24c6145b40 100644
--- a/docs/Mono.Android/en/Android.Net.Sip/SipManager.xml
+++ b/docs/Mono.Android/en/Android.Net.Sip/SipManager.xml
@@ -818,8 +818,6 @@
       <Docs>
         <param name="localProfileUri">URI of the SIP profile to make the call from</param>
         <param name="peerProfileUri">URI of the SIP profile to make the call to</param>
-        <param name="localProfile">the SIP profile to make the call from</param>
-        <param name="peerProfile">the SIP profile to make the call to</param>
         <param name="listener">to listen to the call events from <c>SipAudioCall</c>;
                  can be null</param>
         <param name="timeout">the timeout value in seconds. Default value (defined by
@@ -965,19 +963,19 @@
         <Parameter Name="listener" Type="Android.Net.Sip.ISipRegistrationListener" />
       </Parameters>
       <Docs>
+        <param name="localProfile">the SIP profile to receive incoming calls for</param>
         <param name="incomingCallPendingIntent">When an incoming call is received, the
-      SIP service will call
-      <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='M:Android App PendingIntent Send(Android Content Context,Android App Result,Android App Result)';scope=Xamarin" title="M:Android.App.PendingIntent.Send(Android.Content.Context,Android.App.Result,Android.App.Result)">M:Android.App.PendingIntent.Send(Android.Content.Context,Android.App.Result,Android.App.Result)</a></format> to send back the
-      intent to the caller with <see cref="F:Android.Net.Sip.SipManager.IncomingCallResultCode" /> as the
-      result code and the intent to fill in the call ID and session
-      description information. It cannot be null.</param>
+                 SIP service will call
+                 <c>PendingIntent#send(Context, int, Intent)</c> to send back the
+                 intent to the caller with <c>#INCOMING_CALL_RESULT_CODE</c> as the
+                 result code and the intent to fill in the call ID and session
+                 description information. It cannot be null.</param>
         <param name="listener">to listen to registration events; can be null</param>
-        <param name="localProfile">the SIP profile to make calls from</param>
-        <summary>Opens the profile for making generic SIP calls.</summary>
+        <summary>Opens the profile for making calls and/or receiving generic SIP calls.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/sip/SipManager#open(android.net.sip.SipProfile)" title="Reference documentation">Java documentation for <code>android.net.sip.SipManager.open(android.net.sip.SipProfile)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/sip/SipManager#open(android.net.sip.SipProfile,%20android.app.PendingIntent,%20android.net.sip.SipRegistrationListener)" title="Reference documentation">Java documentation for <code>android.net.sip.SipManager.open(android.net.sip.SipProfile, android.app.PendingIntent, android.net.sip.SipRegistrationListener)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/IpSecAlgorithm.xml b/docs/Mono.Android/en/Android.Net/IpSecAlgorithm.xml
index 83aec491ba..88f883b7b0 100644
--- a/docs/Mono.Android/en/Android.Net/IpSecAlgorithm.xml
+++ b/docs/Mono.Android/en/Android.Net/IpSecAlgorithm.xml
@@ -120,14 +120,14 @@
         <Parameter Name="truncLenBits" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="truncLenBits">To be added.</param>
         <param name="algorithm">name of the algorithm.</param>
         <param name="key">key padded to a multiple of 8 bits.</param>
+        <param name="truncLenBits">number of bits of output hash to use.</param>
         <summary>Creates an IpSecAlgorithm of one of the supported types.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/IpSecAlgorithm#IpSecAlgorithm(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>android.net.IpSecAlgorithm.IpSecAlgorithm(java.lang.String, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/IpSecAlgorithm#IpSecAlgorithm(java.lang.String,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>android.net.IpSecAlgorithm.IpSecAlgorithm(java.lang.String, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/IpSecManager.xml b/docs/Mono.Android/en/Android.Net/IpSecManager.xml
index 6c33579a9a..36d8dd913e 100644
--- a/docs/Mono.Android/en/Android.Net/IpSecManager.xml
+++ b/docs/Mono.Android/en/Android.Net/IpSecManager.xml
@@ -175,14 +175,14 @@
         <Parameter Name="transform" Type="Android.Net.IpSecTransform" />
       </Parameters>
       <Docs>
-        <param name="socket">a socket file descriptor</param>
+        <param name="socket">a datagram socket</param>
         <param name="direction">the direction in which the transform should be applied</param>
         <param name="transform">a transport mode <c>IpSecTransform</c></param>
-        <summary>Apply an IPsec transform to a socket.</summary>
+        <summary>Apply an IPsec transform to a datagram socket.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/IpSecManager#applyTransportModeTransform(java.io.FileDescriptor,%20int,%20android.net.IpSecTransform)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.applyTransportModeTransform(java.io.FileDescriptor, int, android.net.IpSecTransform)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/IpSecManager#applyTransportModeTransform(java.net.DatagramSocket,%20int,%20android.net.IpSecTransform)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.applyTransportModeTransform(java.net.DatagramSocket, int, android.net.IpSecTransform)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,14 +225,14 @@
         <Parameter Name="transform" Type="Android.Net.IpSecTransform" />
       </Parameters>
       <Docs>
-        <param name="socket">a socket file descriptor</param>
+        <param name="socket">a stream socket</param>
         <param name="direction">the direction in which the transform should be applied</param>
         <param name="transform">a transport mode <c>IpSecTransform</c></param>
-        <summary>Apply an IPsec transform to a socket.</summary>
+        <summary>Apply an IPsec transform to a stream socket.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/IpSecManager#applyTransportModeTransform(java.io.FileDescriptor,%20int,%20android.net.IpSecTransform)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.applyTransportModeTransform(java.io.FileDescriptor, int, android.net.IpSecTransform)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/IpSecManager#applyTransportModeTransform(java.net.Socket,%20int,%20android.net.IpSecTransform)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.applyTransportModeTransform(java.net.Socket, int, android.net.IpSecTransform)</code>.</a>
             </format>
           </para>
           <para>
@@ -494,11 +494,11 @@
       </Parameters>
       <Docs>
         <param name="socket">a socket that previously had a transform applied to it</param>
-        <summary>Remove an IPsec transform from a socket.</summary>
+        <summary>Remove an IPsec transform from a datagram socket.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/IpSecManager#removeTransportModeTransforms(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.removeTransportModeTransforms(java.io.FileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/IpSecManager#removeTransportModeTransforms(java.net.DatagramSocket)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.removeTransportModeTransforms(java.net.DatagramSocket)</code>.</a>
             </format>
           </para>
           <para>
@@ -533,11 +533,11 @@
       </Parameters>
       <Docs>
         <param name="socket">a socket that previously had a transform applied to it</param>
-        <summary>Remove an IPsec transform from a socket.</summary>
+        <summary>Remove an IPsec transform from a stream socket.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/IpSecManager#removeTransportModeTransforms(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.removeTransportModeTransforms(java.io.FileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/IpSecManager#removeTransportModeTransforms(java.net.Socket)" title="Reference documentation">Java documentation for <code>android.net.IpSecManager.removeTransportModeTransforms(java.net.Socket)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/LocalSocket.xml b/docs/Mono.Android/en/Android.Net/LocalSocket.xml
index 2e4dd7552e..db83af2aca 100644
--- a/docs/Mono.Android/en/Android.Net/LocalSocket.xml
+++ b/docs/Mono.Android/en/Android.Net/LocalSocket.xml
@@ -107,12 +107,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="sockType">To be added.</param>
-        <summary>Creates a AF_LOCAL/UNIX domain stream socket.</summary>
+        <param name="sockType">either <c>#SOCKET_DGRAM</c>, <c>#SOCKET_STREAM</c>
+            or <c>#SOCKET_SEQPACKET</c></param>
+        <summary>Creates a AF_LOCAL/UNIX domain stream socket with given socket type</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/LocalSocket#LocalSocket()" title="Reference documentation">Java documentation for <code>android.net.LocalSocket.LocalSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/LocalSocket#LocalSocket(int)" title="Reference documentation">Java documentation for <code>android.net.LocalSocket.LocalSocket(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -277,8 +278,8 @@
         <Parameter Name="timeout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
         <param name="endpoint">endpoint address</param>
+        <param name="timeout">To be added.</param>
         <summary>Connects this socket to an endpoint.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/LocalSocketAddress.xml b/docs/Mono.Android/en/Android.Net/LocalSocketAddress.xml
index eeed4bce4c..b4ce263f7f 100644
--- a/docs/Mono.Android/en/Android.Net/LocalSocketAddress.xml
+++ b/docs/Mono.Android/en/Android.Net/LocalSocketAddress.xml
@@ -116,8 +116,8 @@
         <Parameter Name="namespace" Type="Android.Net.LocalSocketAddress+Namespace" />
       </Parameters>
       <Docs>
-        <param name="namespace">To be added.</param>
         <param name="name">non-null name</param>
+        <param name="namespace">To be added.</param>
         <summary>Creates an instance with a given name in the <c>Namespace#ABSTRACT</c>
             namespace</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Net/SSLCertificateSocketFactory.xml b/docs/Mono.Android/en/Android.Net/SSLCertificateSocketFactory.xml
index 19bfad0aa4..a8617035b7 100644
--- a/docs/Mono.Android/en/Android.Net/SSLCertificateSocketFactory.xml
+++ b/docs/Mono.Android/en/Android.Net/SSLCertificateSocketFactory.xml
@@ -142,12 +142,12 @@
         <param name="addr">the host address the socket has to be connected to.</param>
         <param name="port">the port number of the remote host at which the socket is
             connected.</param>
-        <summary>Creates a new socket which is <i>not connected</i> to any remote host.</summary>
+        <summary>[TODO: @inheritDoc]</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket(java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket(java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -191,12 +191,12 @@
         <param name="host">the remote host address the socket has to be connected to.</param>
         <param name="port">the port number of the remote host at which the socket is
             connected.</param>
-        <summary>Creates a new socket which is <i>not connected</i> to any remote host.</summary>
+        <summary>[TODO: @inheritDoc]</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -245,12 +245,12 @@
         <param name="localAddr">the local host address the socket is bound to.</param>
         <param name="localPort">the port number of the local host at which the socket is
             bound.</param>
-        <summary>Creates a new socket which is <i>not connected</i> to any remote host.</summary>
+        <summary>[TODO: @inheritDoc]</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket(java.net.InetAddress,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket(java.net.InetAddress, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -300,12 +300,12 @@
           <c>true</c> if socket <c>s</c> should be closed when the
             created socket is closed, <c>false</c> if the socket
             <c>s</c> should be left open.</param>
-        <summary>Creates a new socket which is <i>not connected</i> to any remote host.</summary>
+        <summary>[TODO: @inheritDoc]</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket(java.net.Socket,%20java.lang.String,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket(java.net.Socket, java.lang.String, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -354,12 +354,12 @@
         <param name="localAddr">the local host address the socket is bound to.</param>
         <param name="localPort">the port number of the local host at which the socket is
             bound.</param>
-        <summary>Creates a new socket which is <i>not connected</i> to any remote host.</summary>
+        <summary>[TODO: @inheritDoc]</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#createSocket(java.lang.String,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.createSocket(java.lang.String, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -446,15 +446,16 @@
         <Parameter Name="cache" Type="Android.Net.SSLSessionCache" />
       </Parameters>
       <Docs>
-        <param name="cache">The <see cref="T:Android.Net.SSLSessionCache" /> to use, or null for no cache.</param>
         <param name="handshakeTimeoutMillis">to use for SSL connection handshake, or 0
                     for none.  The socket timeout is reset to 0 after the handshake.</param>
-        <summary>Returns a new socket factory instance with an optional handshake timeout.</summary>
+        <param name="cache">The <c>SSLSessionCache</c> to use, or null for no cache.</param>
+        <summary>Returns a new socket factory instance with an optional handshake timeout
+            and SSL session cache.</summary>
         <returns>a new SSLSocketFactory with the specified parameters</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#getDefault(int)" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.getDefault(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory#getDefault(int,%20android.net.SSLSessionCache)" title="Reference documentation">Java documentation for <code>android.net.SSLCertificateSocketFactory.getDefault(int, android.net.SSLSessionCache)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/SSLSessionCache.xml b/docs/Mono.Android/en/Android.Net/SSLSessionCache.xml
index 01bf23ef29..7e1fde170c 100644
--- a/docs/Mono.Android/en/Android.Net/SSLSessionCache.xml
+++ b/docs/Mono.Android/en/Android.Net/SSLSessionCache.xml
@@ -91,13 +91,12 @@
         <Parameter Name="dir" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="dir">To be added.</param>
-        <param name="context">for the application</param>
-        <summary>Create a session cache at the default location for this app.</summary>
+        <param name="dir">to store session files in (created if necessary)</param>
+        <summary>Create a session cache using the specified directory.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/SSLSessionCache#SSLSessionCache(android.content.Context)" title="Reference documentation">Java documentation for <code>android.net.SSLSessionCache.SSLSessionCache(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/SSLSessionCache#SSLSessionCache(java.io.File)" title="Reference documentation">Java documentation for <code>android.net.SSLSessionCache.SSLSessionCache(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/TrafficStats.xml b/docs/Mono.Android/en/Android.Net/TrafficStats.xml
index 5c14a79eae..0c4a8fd95f 100644
--- a/docs/Mono.Android/en/Android.Net/TrafficStats.xml
+++ b/docs/Mono.Android/en/Android.Net/TrafficStats.xml
@@ -977,14 +977,14 @@
         <Parameter Name="operationCount" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="tag">Accounting tag used in <see cref="P:Android.Net.TrafficStats.ThreadStatsTag" />.</param>
+        <param name="tag">Accounting tag used in <c>#setThreadStatsTag(int)</c>.</param>
         <param name="operationCount">Number of operations to increment count by.</param>
-        <summary>Increment count of network operations performed under the accounting tag
-            currently active on the calling thread.</summary>
+        <summary>Increment count of network operations performed under the given
+            accounting tag.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/TrafficStats#incrementOperationCount(int)" title="Reference documentation">Java documentation for <code>android.net.TrafficStats.incrementOperationCount(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/TrafficStats#incrementOperationCount(int,%20int)" title="Reference documentation">Java documentation for <code>android.net.TrafficStats.incrementOperationCount(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/Uri.xml b/docs/Mono.Android/en/Android.Net/Uri.xml
index 5728400315..27e451a9be 100644
--- a/docs/Mono.Android/en/Android.Net/Uri.xml
+++ b/docs/Mono.Android/en/Android.Net/Uri.xml
@@ -406,9 +406,9 @@
         <Parameter Name="allow" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="allow">set of additional characters to allow in the encoded form,
-  null if no characters should be skipped</param>
         <param name="s">string to encode</param>
+        <param name="allow">set of additional characters to allow in the encoded form,
+             null if no characters should be skipped</param>
         <summary>Encodes characters in the given string as '%'-escaped octets
             using the UTF-8 scheme.</summary>
         <returns>an encoded version of s suitable for use as a URI component,
@@ -416,7 +416,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/Uri#encode(java.lang.String)" title="Reference documentation">Java documentation for <code>android.net.Uri.encode(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/Uri#encode(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.net.Uri.encode(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Net/UrlQuerySanitizer.xml b/docs/Mono.Android/en/Android.Net/UrlQuerySanitizer.xml
index f3ad9e6a6e..796f71d556 100644
--- a/docs/Mono.Android/en/Android.Net/UrlQuerySanitizer.xml
+++ b/docs/Mono.Android/en/Android.Net/UrlQuerySanitizer.xml
@@ -88,11 +88,11 @@
       </Parameters>
       <Docs>
         <param name="url">To be added.</param>
-        <summary>Constructs a UrlQuerySanitizer.</summary>
+        <summary>Constructs a UrlQuerySanitizer and parses a URL.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/UrlQuerySanitizer#UrlQuerySanitizer()" title="Reference documentation">Java documentation for <code>android.net.UrlQuerySanitizer.UrlQuerySanitizer()</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/UrlQuerySanitizer#UrlQuerySanitizer(java.lang.String)" title="Reference documentation">Java documentation for <code>android.net.UrlQuerySanitizer.UrlQuerySanitizer(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1084,9 +1084,8 @@
         <Parameter Name="valueSanitizer" Type="Android.Net.UrlQuerySanitizer+IValueSanitizer" />
       </Parameters>
       <Docs>
-        <param name="valueSanitizer">To be added.</param>
         <param name="parameters">An array of unencoded parameter names.</param>
-        <param name="valueSanitizer&#xA;@see&#xA;@see">#registerParameter</param>
+        <param name="valueSanitizer">To be added.</param>
         <summary>Register a value sanitizer for an array of parameters.</summary>
         <remarks>
           <para>
@@ -1260,8 +1259,6 @@
         <ReturnType>Android.Net.UrlQuerySanitizer+IValueSanitizer</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="sanitizer">set the ValueSanitizer used to sanitize unregistered
-            parameter values.</param>
         <summary>Get the current value sanitizer used when processing
             unregistered parameter values. -or- Set the value sanitizer used when processing unregistered
             parameter values.</summary>
diff --git a/docs/Mono.Android/en/Android.Net/VpnService.xml b/docs/Mono.Android/en/Android.Net/VpnService.xml
index 8e0e8ac385..2423d01852 100644
--- a/docs/Mono.Android/en/Android.Net/VpnService.xml
+++ b/docs/Mono.Android/en/Android.Net/VpnService.xml
@@ -334,13 +334,14 @@
       </Parameters>
       <Docs>
         <param name="socket">To be added.</param>
-        <summary>Protect a socket from VPN connections.</summary>
+        <summary>Convenience method to protect a <c>DatagramSocket</c> from VPN
+            connections.</summary>
         <returns>
           <c>true</c> on success.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/VpnService#protect(int)" title="Reference documentation">Java documentation for <code>android.net.VpnService.protect(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/VpnService#protect(java.net.DatagramSocket)" title="Reference documentation">Java documentation for <code>android.net.VpnService.protect(java.net.DatagramSocket)</code>.</a>
             </format>
           </para>
           <para>
@@ -377,13 +378,13 @@
       </Parameters>
       <Docs>
         <param name="socket">To be added.</param>
-        <summary>Protect a socket from VPN connections.</summary>
+        <summary>Convenience method to protect a <c>Socket</c> from VPN connections.</summary>
         <returns>
           <c>true</c> on success.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/net/VpnService#protect(int)" title="Reference documentation">Java documentation for <code>android.net.VpnService.protect(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/net/VpnService#protect(java.net.Socket)" title="Reference documentation">Java documentation for <code>android.net.VpnService.protect(java.net.Socket)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Nfc/NdefMessage.xml b/docs/Mono.Android/en/Android.Nfc/NdefMessage.xml
index 0ff375b818..2a9bbbcc7b 100644
--- a/docs/Mono.Android/en/Android.Nfc/NdefMessage.xml
+++ b/docs/Mono.Android/en/Android.Nfc/NdefMessage.xml
@@ -67,13 +67,12 @@
         <Parameter Name="records" Type="Android.Nfc.NdefRecord[]" />
       </Parameters>
       <Docs>
-        <param name="record">first record (mandatory)</param>
-        <param name="records">additional records (optional)</param>
+        <param name="records">one or more records</param>
         <summary>Construct an NDEF Message from one or more NDEF Records.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/nfc/NdefMessage#NdefMessage(android.nfc.NdefRecord,%20android.nfc.NdefRecord)" title="Reference documentation">Java documentation for <code>android.nfc.NdefMessage.NdefMessage(android.nfc.NdefRecord, android.nfc.NdefRecord)</code>.</a>
+              <a href="https://developer.android.com/reference/android/nfc/NdefMessage#NdefMessage(android.nfc.NdefRecord[])" title="Reference documentation">Java documentation for <code>android.nfc.NdefMessage.NdefMessage(android.nfc.NdefRecord[])</code>.</a>
             </format>
           </para>
           <para>
@@ -105,14 +104,12 @@
         <Parameter Name="data" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
-        <param name="record">first record (mandatory)</param>
-        <param name="records">additional records (optional)</param>
-        <summary>Construct an NDEF Message from one or more NDEF Records.</summary>
+        <param name="data">raw bytes to parse</param>
+        <summary>Construct an NDEF Message by parsing raw bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/nfc/NdefMessage#NdefMessage(android.nfc.NdefRecord,%20android.nfc.NdefRecord)" title="Reference documentation">Java documentation for <code>android.nfc.NdefMessage.NdefMessage(android.nfc.NdefRecord, android.nfc.NdefRecord)</code>.</a>
+              <a href="https://developer.android.com/reference/android/nfc/NdefMessage#NdefMessage(byte[])" title="Reference documentation">Java documentation for <code>android.nfc.NdefMessage.NdefMessage(byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Nfc/NdefRecord.xml b/docs/Mono.Android/en/Android.Nfc/NdefRecord.xml
index 79cf867442..c328ea2ef3 100644
--- a/docs/Mono.Android/en/Android.Nfc/NdefRecord.xml
+++ b/docs/Mono.Android/en/Android.Nfc/NdefRecord.xml
@@ -71,10 +71,19 @@
         <Parameter Name="data" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
+        <param name="data">raw bytes to parse</param>
         <summary>Construct an NDEF Record from raw bytes.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/nfc/NdefRecord#NdefRecord(byte[])" title="Reference documentation">Java documentation for <code>android.nfc.NdefRecord.NdefRecord(byte[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 9" />
         <exception cref="T:Android.Nfc.FormatException">if the data cannot be parsed into a valid record</exception>
@@ -354,13 +363,12 @@
       </Parameters>
       <Docs>
         <param name="uriString">string URI to encode.</param>
-        <param name="uri">URI to encode.</param>
         <summary>Create a new NDEF Record containing a URI.</summary>
         <returns>an NDEF Record containing the URI</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/nfc/NdefRecord#createUri(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.nfc.NdefRecord.createUri(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/nfc/NdefRecord#createUri(java.lang.String)" title="Reference documentation">Java documentation for <code>android.nfc.NdefRecord.createUri(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Nfc/NfcAdapter.xml b/docs/Mono.Android/en/Android.Nfc/NfcAdapter.xml
index 0020f313c4..dc62dc9e3b 100644
--- a/docs/Mono.Android/en/Android.Nfc/NfcAdapter.xml
+++ b/docs/Mono.Android/en/Android.Nfc/NfcAdapter.xml
@@ -1184,9 +1184,18 @@
       <Docs>
         <param name="context">the calling application's context</param>
         <summary>Helper to get the default NFC Adapter.</summary>
-        <returns>To be added.</returns>
+        <returns>the default NFC adapter, or null if no NFC adapter exists</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/nfc/NfcAdapter#getDefaultAdapter(android.content.Context)" title="Reference documentation">Java documentation for <code>android.nfc.NfcAdapter.getDefaultAdapter(android.content.Context)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.OS.Health/TimerStat.xml b/docs/Mono.Android/en/Android.OS.Health/TimerStat.xml
index 70b8183ac8..1b54060409 100644
--- a/docs/Mono.Android/en/Android.OS.Health/TimerStat.xml
+++ b/docs/Mono.Android/en/Android.OS.Health/TimerStat.xml
@@ -99,11 +99,12 @@
       </Parameters>
       <Docs>
         <param name="in">To be added.</param>
-        <summary>Construct an empty TimerStat object with the count and time set to 0.</summary>
+        <summary>Construct a TimerStat object reading the values from a <c>android.os.Parcel Parcel</c>
+            object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/health/TimerStat#TimerStat()" title="Reference documentation">Java documentation for <code>android.os.health.TimerStat.TimerStat()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/health/TimerStat#TimerStat(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.os.health.TimerStat.TimerStat(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -135,13 +136,13 @@
         <Parameter Name="time" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="count">To be added.</param>
-        <param name="time">To be added.</param>
-        <summary>Construct an empty TimerStat object with the count and time set to 0.</summary>
+        <param name="count">The count</param>
+        <param name="time">The time</param>
+        <summary>Construct a TimerStat object with the supplied count and time fields.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/health/TimerStat#TimerStat()" title="Reference documentation">Java documentation for <code>android.os.health.TimerStat.TimerStat()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/health/TimerStat#TimerStat(int,%20long)" title="Reference documentation">Java documentation for <code>android.os.health.TimerStat.TimerStat(int, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml b/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml
index de37203b24..98c05f42bd 100644
--- a/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml
+++ b/docs/Mono.Android/en/Android.OS.Storage/StorageManager.xml
@@ -201,19 +201,16 @@
         <Parameter Name="bytes" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="storageUuid">To be added.</param>
-        <param name="fd">the open file that you'd like to allocate disk space for.</param>
-        <param name="bytes">the number of bytes to allocate. This is the desired final
-                       size of the open file. If the open file is smaller than this
-                       requested size, it will be extended without modifying any
-                       existing contents. If the open file is larger than this
-                       requested size, it will be truncated.</param>
-        <summary>Allocate the requested number of bytes for your application to use in the
-            given open file.</summary>
+        <param name="storageUuid">the UUID of the storage volume where you'd like to
+                       allocate disk space. The UUID for a specific path can be
+                       obtained using <c>#getUuidForPath(File)</c>.</param>
+        <param name="bytes">the number of bytes to allocate.</param>
+        <summary>Allocate the requested number of bytes for your application to use on the
+            given storage volume.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/storage/StorageManager#allocateBytes(java.io.FileDescriptor,%20long)" title="Reference documentation">Java documentation for <code>android.os.storage.StorageManager.allocateBytes(java.io.FileDescriptor, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/storage/StorageManager#allocateBytes(java.util.UUID,%20long)" title="Reference documentation">Java documentation for <code>android.os.storage.StorageManager.allocateBytes(java.util.UUID, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -611,13 +608,13 @@
       </Parameters>
       <Docs>
         <param name="file">To be added.</param>
-        <summary>Return the <c>StorageVolume</c> that contains the given
-            <c>MediaStore</c> item.</summary>
+        <summary>Return the <c>StorageVolume</c> that contains the given file, or
+            <c>null</c> if none.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/storage/StorageManager#getStorageVolume(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.os.storage.StorageManager.getStorageVolume(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/storage/StorageManager#getStorageVolume(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.storage.StorageManager.getStorageVolume(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -852,10 +849,20 @@
       </Parameters>
       <Docs>
         <param name="file">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Return if data stored at or under the given path will be encrypted while
+            at rest.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/storage/StorageManager#isEncrypted(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.storage.StorageManager.isEncrypted(java.io.File)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.OS/AsyncTask.xml b/docs/Mono.Android/en/Android.OS/AsyncTask.xml
index 7ed00b62ed..189c6f8128 100644
--- a/docs/Mono.Android/en/Android.OS/AsyncTask.xml
+++ b/docs/Mono.Android/en/Android.OS/AsyncTask.xml
@@ -185,7 +185,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#doInBackground(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.doInBackground(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#doInBackground(java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.doInBackground(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -224,13 +224,13 @@
       </Parameters>
       <Docs>
         <param name="runnable">To be added.</param>
-        <param name="params">The parameters of the task.</param>
-        <summary>Executes the task with the specified parameters.</summary>
+        <summary>Convenience version of <c>#execute(Object...)</c> for use with
+            a simple Runnable object.</summary>
         <returns>This instance of AsyncTask.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#execute(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.execute(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#execute(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.execute(java.lang.Runnable)</code>.</a>
             </format>
           </para>
           <para>
@@ -282,7 +282,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#execute(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.execute(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#execute(java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.execute(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -336,7 +336,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#executeOnExecutor(java.util.concurrent.Executor,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.executeOnExecutor(java.util.concurrent.Executor, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#executeOnExecutor(java.util.concurrent.Executor,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.executeOnExecutor(java.util.concurrent.Executor, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -425,13 +425,13 @@
       <Docs>
         <param name="timeout">Time to wait before cancelling the operation.</param>
         <param name="unit">The time unit for the timeout.</param>
-        <summary>Waits if necessary for the computation to complete, and then
-            retrieves its result.</summary>
+        <summary>Waits if necessary for at most the given time for the computation
+            to complete, and then retrieves its result.</summary>
         <returns>The computed result.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#get()" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.get()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#get(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.get(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -682,12 +682,14 @@
         <Parameter Name="result" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="result">To be added.</param>
-        <summary>Applications should preferably override <c>#onCancelled(Object)</c>.</summary>
+        <param name="result">The result, if any, computed in
+                          <c>#doInBackground(Object[])</c>, can be null</param>
+        <summary>Runs on the UI thread after <c>#cancel(boolean)</c> is invoked and
+            <c>#doInBackground(Object[])</c> has finished.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#onCancelled()" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.onCancelled()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#onCancelled(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.onCancelled(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -821,7 +823,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#onProgressUpdate(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.onProgressUpdate(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#onProgressUpdate(java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.onProgressUpdate(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -873,7 +875,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/AsyncTask#publishProgress(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.publishProgress(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/AsyncTask#publishProgress(java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.os.AsyncTask.publishProgress(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/BaseBundle.xml b/docs/Mono.Android/en/Android.OS/BaseBundle.xml
index a8b10bef09..60460d6d43 100644
--- a/docs/Mono.Android/en/Android.OS/BaseBundle.xml
+++ b/docs/Mono.Android/en/Android.OS/BaseBundle.xml
@@ -238,15 +238,15 @@
         <Parameter Name="defaultValue" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">To be added.</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or false if
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
             no mapping of the desired type exists for the given key.</summary>
         <returns>a boolean value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/BaseBundle#getBoolean(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getBoolean(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/BaseBundle#getBoolean(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getBoolean(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -363,14 +363,15 @@
         <Parameter Name="defaultValue" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or 0.</summary>
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
+            no mapping of the desired type exists for the given key.</summary>
         <returns>a double value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/BaseBundle#getDouble(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getDouble(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/BaseBundle#getDouble(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getDouble(java.lang.String, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -488,15 +489,15 @@
         <Parameter Name="defaultValue" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or 0 if
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
             no mapping of the desired type exists for the given key.</summary>
         <returns>an int value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/BaseBundle#getInt(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getInt(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/BaseBundle#getInt(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getInt(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -614,15 +615,15 @@
         <Parameter Name="defaultValue" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or 0L if
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
             no mapping of the desired type exists for the given key.</summary>
         <returns>a long value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/BaseBundle#getLong(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getLong(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/BaseBundle#getLong(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getLong(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -741,17 +742,18 @@
         <Parameter Name="defaultValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist or if a null
-     value is associated with the given key.</param>
         <param name="key">a String, or null</param>
-        <summary>Returns the value associated with the given key, or null if
-            no mapping of the desired type exists for the given key or a null
-            value is explicitly associated with the key.</summary>
-        <returns>a String value, or null</returns>
+        <param name="defaultValue">Value to return if key does not exist or if a null
+                value is associated with the given key.</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
+            no mapping of the desired type exists for the given key or if a null
+            value is explicitly associated with the given key.</summary>
+        <returns>the String value associated with the given key, or defaultValue
+                if no valid String object is currently mapped to that key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/BaseBundle#getString(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getString(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/BaseBundle#getString(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.BaseBundle.getString(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Binder.xml b/docs/Mono.Android/en/Android.OS/Binder.xml
index 37c98fc545..8d954f6050 100644
--- a/docs/Mono.Android/en/Android.OS/Binder.xml
+++ b/docs/Mono.Android/en/Android.OS/Binder.xml
@@ -101,12 +101,14 @@
         <Parameter Name="descriptor" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="descriptor">To be added.</param>
-        <summary>Default constructor just initializes the object.</summary>
+        <param name="descriptor">Used to identify the creator of this token, for example the class name.
+            Instead of creating multiple tokens with the same descriptor, consider adding a suffix to
+            help identify them.</param>
+        <summary>Constructor for creating a raw Binder object (token) along with a descriptor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Binder#Binder()" title="Reference documentation">Java documentation for <code>android.os.Binder.Binder()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Binder#Binder(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Binder.Binder(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -477,14 +479,13 @@
       </Parameters>
       <Docs>
         <param name="fd">The raw file descriptor that the dump is being sent to.</param>
-        <param name="fout">The file to which you should dump your state.  This will be
-            closed for you after you return.</param>
         <param name="args">additional arguments to the dump request.</param>
-        <summary>Print the object's state into the given stream.</summary>
+        <summary>Implemented to call the more convenient version
+            <c>#dump(FileDescriptor, PrintWriter, String[])</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Binder#dump(java.io.FileDescriptor,%20java.io.PrintWriter,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.os.Binder.dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Binder#dump(java.io.FileDescriptor,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.os.Binder.dump(java.io.FileDescriptor, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/BugreportManager.xml b/docs/Mono.Android/en/Android.OS/BugreportManager.xml
index e8e2f9d99f..b9e451cb69 100644
--- a/docs/Mono.Android/en/Android.OS/BugreportManager.xml
+++ b/docs/Mono.Android/en/Android.OS/BugreportManager.xml
@@ -123,9 +123,9 @@
         <Parameter Name="callback" Type="Android.OS.BugreportManager+BugreportCallback" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="bugreportFd">file to write the bugreport. This should be opened in write-only, append
                 mode.</param>
+        <param name="executor">To be added.</param>
         <param name="callback">callback for progress and status updates.</param>
         <summary>Starts a connectivity bugreport.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.OS/Bundle.xml b/docs/Mono.Android/en/Android.OS/Bundle.xml
index 9a60110f08..c064fdd313 100644
--- a/docs/Mono.Android/en/Android.OS/Bundle.xml
+++ b/docs/Mono.Android/en/Android.OS/Bundle.xml
@@ -103,12 +103,13 @@
         <Parameter Name="b" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Constructs a new, empty Bundle.</summary>
+        <param name="b">a Bundle to be copied.</param>
+        <summary>Constructs a Bundle containing a copy of the mappings from the given
+            Bundle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle()" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle(android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -140,12 +141,13 @@
         <Parameter Name="b" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Constructs a new, empty Bundle.</summary>
+        <param name="b">a PersistableBundle to be copied.</param>
+        <summary>Constructs a Bundle containing a copy of the mappings from the given
+            PersistableBundle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle()" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle(android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle(android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -176,12 +178,14 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="loader">To be added.</param>
-        <summary>Constructs a new, empty Bundle.</summary>
+        <param name="loader">An explicit ClassLoader to use when instantiating objects
+            inside of the Bundle.</param>
+        <summary>Constructs a new, empty Bundle that uses a specific ClassLoader for
+            instantiating Parcelable and Serializable objects.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle()" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle(java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle(java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -213,12 +217,13 @@
         <Parameter Name="capacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="capacity">To be added.</param>
-        <summary>Constructs a new, empty Bundle.</summary>
+        <param name="capacity">the initial capacity of the Bundle</param>
+        <summary>Constructs a new, empty Bundle sized to hold the given number of
+            elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle()" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#Bundle(int)" title="Reference documentation">Java documentation for <code>android.os.Bundle.Bundle(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -805,15 +810,15 @@
         <Parameter Name="defaultValue" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or (byte) 0 if
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
             no mapping of the desired type exists for the given key.</summary>
         <returns>a byte value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#getByte(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getByte(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#getByte(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getByte(java.lang.String, byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -934,15 +939,15 @@
         <Parameter Name="defaultValue" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or (char) 0 if
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
             no mapping of the desired type exists for the given key.</summary>
         <returns>a char value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#getChar(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getChar(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#getChar(java.lang.String,%20char)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getChar(java.lang.String, char)</code>.</a>
             </format>
           </para>
           <para>
@@ -1051,16 +1056,18 @@
         <Parameter Name="defaultValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">To be added.</param>
         <param name="key">a String, or null</param>
-        <summary>Returns the value associated with the given key, or null if
-            no mapping of the desired type exists for the given key or a null
-            value is explicitly associated with the key.</summary>
-        <returns>a CharSequence value, or null</returns>
+        <param name="defaultValue">Value to return if key does not exist or if a null
+                value is associated with the given key.</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
+            no mapping of the desired type exists for the given key or if a null
+            value is explicitly associatd with the given key.</summary>
+        <returns>the CharSequence value associated with the given key, or defaultValue
+                if no valid CharSequence object is currently mapped to that key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#getCharSequence(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getCharSequence(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#getCharSequence(java.lang.String,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getCharSequence(java.lang.String, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1260,17 +1267,18 @@
         <Parameter Name="defaultValue" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist or if a null
-     value is associated with the given key.</param>
         <param name="key">a String, or null</param>
-        <summary>Returns the value associated with the given key, or null if
-            no mapping of the desired type exists for the given key or a null
-            value is explicitly associated with the key.</summary>
-        <returns>a CharSequence value, or null</returns>
+        <param name="defaultValue">Value to return if key does not exist or if a null
+                value is associated with the given key.</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
+            no mapping of the desired type exists for the given key or if a null
+            value is explicitly associatd with the given key.</summary>
+        <returns>the CharSequence value associated with the given key, or defaultValue
+                if no valid CharSequence object is currently mapped to that key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#getCharSequence(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getCharSequence(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#getCharSequence(java.lang.String,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getCharSequence(java.lang.String, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1449,14 +1457,15 @@
         <Parameter Name="defaultValue" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or 0.</summary>
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
+            no mapping of the desired type exists for the given key.</summary>
         <returns>a float value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#getFloat(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getFloat(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#getFloat(java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getFloat(java.lang.String, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2004,15 +2013,15 @@
         <Parameter Name="defaultValue" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">Value to return if key does not exist</param>
         <param name="key">a String</param>
-        <summary>Returns the value associated with the given key, or (short) 0 if
+        <param name="defaultValue">Value to return if key does not exist</param>
+        <summary>Returns the value associated with the given key, or defaultValue if
             no mapping of the desired type exists for the given key.</summary>
         <returns>a short value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Bundle#getShort(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getShort(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Bundle#getShort(java.lang.String,%20short)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getShort(java.lang.String, short)</code>.</a>
             </format>
           </para>
           <para>
@@ -2092,11 +2101,20 @@
       <Docs>
         <param name="key">a String, or null</param>
         <summary>Returns the value associated with the given key, or null if
- no mapping of the desired type exists for the given key or a null
- value is explicitly associated with the key.</summary>
-        <returns>To be added.</returns>
+            no mapping of the desired type exists for the given key or a null
+            value is explicitly associated with the key.</summary>
+        <returns>a Size value, or null</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Bundle#getSize(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Bundle.getSize(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.OS/ConditionVariable.xml b/docs/Mono.Android/en/Android.OS/ConditionVariable.xml
index deefadf72e..f23cda8e4e 100644
--- a/docs/Mono.Android/en/Android.OS/ConditionVariable.xml
+++ b/docs/Mono.Android/en/Android.OS/ConditionVariable.xml
@@ -88,11 +88,11 @@
       </Parameters>
       <Docs>
         <param name="state">To be added.</param>
-        <summary>Create the ConditionVariable in the default closed state.</summary>
+        <summary>Create the ConditionVariable with the given state.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/ConditionVariable#ConditionVariable()" title="Reference documentation">Java documentation for <code>android.os.ConditionVariable.ConditionVariable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/ConditionVariable#ConditionVariable(boolean)" title="Reference documentation">Java documentation for <code>android.os.ConditionVariable.ConditionVariable(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,13 +187,15 @@
         <Parameter Name="timeoutMs" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timeoutMs">To be added.</param>
-        <summary>Block the current thread until the condition is opened.</summary>
-        <returns>To be added.</returns>
+        <param name="timeoutMs">the maximum time to wait in milliseconds.</param>
+        <summary>Block the current thread until the condition is opened or until
+            timeoutMs milliseconds have passed.</summary>
+        <returns>true if the condition was opened, false if the call returns
+            because of the timeout.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/ConditionVariable#block()" title="Reference documentation">Java documentation for <code>android.os.ConditionVariable.block()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/ConditionVariable#block(long)" title="Reference documentation">Java documentation for <code>android.os.ConditionVariable.block(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Debug.xml b/docs/Mono.Android/en/Android.OS/Debug.xml
index 00d0109697..00accd4c74 100644
--- a/docs/Mono.Android/en/Android.OS/Debug.xml
+++ b/docs/Mono.Android/en/Android.OS/Debug.xml
@@ -2369,12 +2369,15 @@
         <Parameter Name="tracePath" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="tracePath">To be added.</param>
-        <summary>Start method tracing with default log name and buffer size.</summary>
+        <param name="tracePath">Path to the trace log file to create. If <c>null</c>,
+                       this will default to "dmtrace.trace". If the file already
+                       exists, it will be truncated. If the path given does not end
+                       in ".trace", it will be appended for you.</param>
+        <summary>Start method tracing, specifying the trace log file path.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Debug#startMethodTracing()" title="Reference documentation">Java documentation for <code>android.os.Debug.startMethodTracing()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Debug#startMethodTracing(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Debug.startMethodTracing(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2410,14 +2413,18 @@
         <Parameter Name="bufferSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="tracePath">To be added.</param>
-        <param name="bufferSize">The maximum amount of trace data we gather. If not given, it defaults to 8MB.
-</param>
-        <summary>Start method tracing with default log name and buffer size.</summary>
+        <param name="tracePath">Path to the trace log file to create. If <c>null</c>,
+                       this will default to "dmtrace.trace". If the file already
+                       exists, it will be truncated. If the path given does not end
+                       in ".trace", it will be appended for you.</param>
+        <param name="bufferSize">The maximum amount of trace data we gather. If not
+                       given, it defaults to 8MB.</param>
+        <summary>Start method tracing, specifying the trace log file name and the buffer
+            size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Debug#startMethodTracing()" title="Reference documentation">Java documentation for <code>android.os.Debug.startMethodTracing()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Debug#startMethodTracing(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.os.Debug.startMethodTracing(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2461,15 +2468,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="tracePath">To be added.</param>
-        <param name="bufferSize">The maximum amount of trace data we gather. If not given, it defaults to 8MB.</param>
-        <param name="flags">Flags to control method tracing. The only one that is currently defined is <see cref="F:Android.OS.Debug.TraceCountAllocs" />.
-</param>
-        <summary>Start method tracing with default log name and buffer size.</summary>
+        <param name="tracePath">Path to the trace log file to create. If <c>null</c>,
+                       this will default to "dmtrace.trace". If the file already
+                       exists, it will be truncated. If the path given does not end
+                       in ".trace", it will be appended for you.</param>
+        <param name="bufferSize">The maximum amount of trace data we gather. If not
+                       given, it defaults to 8MB.</param>
+        <param name="flags">Flags to control method tracing. The only one that is
+                       currently defined is <c>#TRACE_COUNT_ALLOCS</c>.</param>
+        <summary>Start method tracing, specifying the trace log file name, the buffer
+            size, and flags.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Debug#startMethodTracing()" title="Reference documentation">Java documentation for <code>android.os.Debug.startMethodTracing()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Debug#startMethodTracing(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.os.Debug.startMethodTracing(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Environment.xml b/docs/Mono.Android/en/Android.OS/Environment.xml
index 56744b3337..8b0841a145 100644
--- a/docs/Mono.Android/en/Android.OS/Environment.xml
+++ b/docs/Mono.Android/en/Android.OS/Environment.xml
@@ -794,7 +794,8 @@
       </Parameters>
       <Docs>
         <param name="path">To be added.</param>
-        <summary>Returns the current state of the primary shared/external storage media.</summary>
+        <summary>Returns the current state of the shared/external storage media at the
+            given path.</summary>
         <returns>one of <c>#MEDIA_UNKNOWN</c>, <c>#MEDIA_REMOVED</c>,
                     <c>#MEDIA_UNMOUNTED</c>, <c>#MEDIA_CHECKING</c>,
                     <c>#MEDIA_NOFS</c>, <c>#MEDIA_MOUNTED</c>,
@@ -803,7 +804,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Environment#getExternalStorageState()" title="Reference documentation">Java documentation for <code>android.os.Environment.getExternalStorageState()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Environment#getExternalStorageState(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.Environment.getExternalStorageState(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -883,12 +884,13 @@
       </Parameters>
       <Docs>
         <param name="path">To be added.</param>
-        <summary>Returns whether the primary shared/external storage media is emulated.</summary>
+        <summary>Returns whether the shared/external storage media at the given path is
+            emulated.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageEmulated()" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageEmulated()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageEmulated(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageEmulated(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -932,7 +934,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageLegacy()" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageLegacy()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageLegacy(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageLegacy(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -967,13 +969,12 @@
       </Parameters>
       <Docs>
         <param name="path">To be added.</param>
-        <summary>Returns whether the calling app has All Files Access on the primary shared/external storage
-            media.</summary>
+        <summary>Returns whether the calling app has All Files Access at the given <c>path</c></summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageManager()" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageManager()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageManager(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageManager(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -1008,15 +1009,15 @@
       </Parameters>
       <Docs>
         <param name="path">To be added.</param>
-        <summary>Returns whether the primary shared/external storage media is physically
-            removable.</summary>
+        <summary>Returns whether the shared/external storage media at the given path is
+            physically removable.</summary>
         <returns>true if the storage device can be removed (such as an SD card),
                     or false if the storage device is built in and cannot be
                     physically removed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageRemovable()" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageRemovable()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Environment#isExternalStorageRemovable(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.Environment.isExternalStorageRemovable(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/FileObserver.xml b/docs/Mono.Android/en/Android.OS/FileObserver.xml
index 8920bd1c2a..8883d475fb 100644
--- a/docs/Mono.Android/en/Android.OS/FileObserver.xml
+++ b/docs/Mono.Android/en/Android.OS/FileObserver.xml
@@ -90,12 +90,12 @@
         <Parameter Name="files" Type="System.Collections.Generic.IList&lt;Java.IO.File&gt;" />
       </Parameters>
       <Docs>
-        <param name="files">To be added.</param>
-        <summary>Equivalent to FileObserver(file, FileObserver.</summary>
+        <param name="files">The files or directories to monitor</param>
+        <summary>Equivalent to FileObserver(paths, FileObserver.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.util.List)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -131,11 +131,11 @@
       </Parameters>
       <Docs>
         <param name="path">To be added.</param>
-        <summary>Equivalent to FileObserver(file, FileObserver.</summary>
+        <summary>Equivalent to FileObserver(path, FileObserver.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -175,13 +175,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
-        <param name="mask">To be added.</param>
-        <summary>Equivalent to FileObserver(file, FileObserver.</summary>
+        <param name="file">The file or directory to monitor</param>
+        <param name="mask">The event or events (added together) to watch for</param>
+        <summary>Create a new file observer for a certain file or directory.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.io.File,%20int)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.io.File, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -220,13 +220,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="files">To be added.</param>
-        <param name="mask">To be added.</param>
-        <summary>Equivalent to FileObserver(file, FileObserver.</summary>
+        <param name="files">The files or directories to monitor</param>
+        <param name="mask">The event or events (added together) to watch for</param>
+        <summary>Version of <c>#FileObserver(File, int)</c> that allows callers to monitor
+            multiple files or directories.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.util.List,%20int)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.util.List, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -292,13 +293,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="mask">To be added.</param>
-        <summary>Equivalent to FileObserver(file, FileObserver.</summary>
+        <param name="path">The file or directory to monitor</param>
+        <param name="mask">The event or events (added together) to watch for</param>
+        <summary>Create a new file observer for a certain file or directory.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.io.File)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/FileObserver#FileObserver(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.os.FileObserver.FileObserver(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/FileUtils.xml b/docs/Mono.Android/en/Android.OS/FileUtils.xml
index 25250bc8ce..0889ae8926 100644
--- a/docs/Mono.Android/en/Android.OS/FileUtils.xml
+++ b/docs/Mono.Android/en/Android.OS/FileUtils.xml
@@ -108,7 +108,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/FileUtils#closeQuietly(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.os.FileUtils.closeQuietly(java.io.FileDescriptor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/FileUtils#closeQuietly(java.lang.AutoCloseable)" title="Reference documentation">Java documentation for <code>android.os.FileUtils.closeQuietly(java.lang.AutoCloseable)</code>.</a>
             </format>
           </para>
           <para>
@@ -145,9 +145,20 @@
       <Docs>
         <param name="in">To be added.</param>
         <param name="out">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <summary>Copy the contents of one FD to another.</summary>
+        <returns>number of bytes copied.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/FileUtils#copy(java.io.FileDescriptor,%20java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.os.FileUtils.copy(java.io.FileDescriptor, java.io.FileDescriptor)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Copy">
@@ -176,9 +187,20 @@
       <Docs>
         <param name="in">To be added.</param>
         <param name="out">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <summary>Copy the contents of one stream to another.</summary>
+        <returns>number of bytes copied.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/FileUtils#copy(java.io.InputStream,%20java.io.OutputStream)" title="Reference documentation">Java documentation for <code>android.os.FileUtils.copy(java.io.InputStream, java.io.OutputStream)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Copy">
diff --git a/docs/Mono.Android/en/Android.OS/Handler.xml b/docs/Mono.Android/en/Android.OS/Handler.xml
index e52b28b83f..8ee27ab57c 100644
--- a/docs/Mono.Android/en/Android.OS/Handler.xml
+++ b/docs/Mono.Android/en/Android.OS/Handler.xml
@@ -118,10 +118,19 @@
         <Parameter Name="looper" Type="Android.OS.Looper" />
       </Parameters>
       <Docs>
-        <param name="looper">To be added.</param>
-        <summary>Use the provided <see cref="T:Android.OS.Looper" /> instead of the default one.</summary>
+        <param name="looper">The looper, must not be null.</param>
+        <summary>Use the provided <c>Looper</c> instead of the default one.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Handler#Handler(android.os.Looper)" title="Reference documentation">Java documentation for <code>android.os.Handler.Handler(android.os.Looper)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -266,8 +275,8 @@
         <Parameter Name="callback" Type="Android.OS.Handler+ICallback" />
       </Parameters>
       <Docs>
-        <param name="callback">To be added.</param>
         <param name="looper">the Looper that the new Handler should be bound to</param>
+        <param name="callback">To be added.</param>
         <summary>Create a new Handler whose posted messages and runnables are not subject to
             synchronization barriers such as display vsync.</summary>
         <returns>a new async Handler instance</returns>
@@ -576,13 +585,13 @@
       <Docs>
         <param name="what">To be added.</param>
         <param name="object">To be added.</param>
-        <summary>Check if there are any pending posts of messages with code 'what' in
-            the message queue.</summary>
+        <summary>Check if there are any pending posts of messages with code 'what' and
+            whose obj is 'object' in the message queue.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#hasMessages(int)" title="Reference documentation">Java documentation for <code>android.os.Handler.hasMessages(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#hasMessages(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.Handler.hasMessages(int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -716,12 +725,12 @@
       </Parameters>
       <Docs>
         <param name="what">Value to assign to the returned Message.what field.</param>
-        <summary>Returns a new <c>android.os.Message Message</c> from the global message pool.</summary>
-        <returns>To be added.</returns>
+        <summary>Same as <c>#obtainMessage()</c>, except that it also sets the what member of the returned Message.</summary>
+        <returns>A Message from the global message pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage()" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage(int)" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -759,12 +768,13 @@
       <Docs>
         <param name="what">Value to assign to the returned Message.what field.</param>
         <param name="obj">Value to assign to the returned Message.obj field.</param>
-        <summary>Returns a new <c>android.os.Message Message</c> from the global message pool.</summary>
-        <returns>To be added.</returns>
+        <summary>Same as <c>#obtainMessage()</c>, except that it also sets the what and obj members 
+            of the returned Message.</summary>
+        <returns>A Message from the global message pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage()" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage(int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -804,12 +814,13 @@
         <param name="what">Value to assign to the returned Message.what field.</param>
         <param name="arg1">Value to assign to the returned Message.arg1 field.</param>
         <param name="arg2">Value to assign to the returned Message.arg2 field.</param>
-        <summary>Returns a new <c>android.os.Message Message</c> from the global message pool.</summary>
-        <returns>To be added.</returns>
+        <summary>Same as <c>#obtainMessage()</c>, except that it also sets the what, arg1 and arg2 members of the returned
+            Message.</summary>
+        <returns>A Message from the global message pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage()" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -851,12 +862,13 @@
         <param name="arg1">Value to assign to the returned Message.arg1 field.</param>
         <param name="arg2">Value to assign to the returned Message.arg2 field.</param>
         <param name="obj">Value to assign to the returned Message.obj field.</param>
-        <summary>Returns a new <c>android.os.Message Message</c> from the global message pool.</summary>
-        <returns>To be added.</returns>
+        <summary>Same as <c>#obtainMessage()</c>, except that it also sets the what, obj, arg1,and arg2 values on the 
+            returned Message.</summary>
+        <returns>A Message from the global message pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage()" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#obtainMessage(int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.Handler.obtainMessage(int, int, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1106,8 +1118,9 @@
         <Parameter Name="uptimeMillis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="token">To be added.</param>
         <param name="r">The Runnable that will be executed.</param>
+        <param name="token">An instance which can be used to cancel <c>r</c> via
+                    <c>#removeCallbacksAndMessages</c>.</param>
         <param name="uptimeMillis">The absolute time at which the callback should run,
                     using the <c>android.os.SystemClock#uptimeMillis</c> time-base.</param>
         <summary>Causes the Runnable r to be added to the message queue, to be run
@@ -1121,7 +1134,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#postAtTime(java.lang.Runnable,%20long)" title="Reference documentation">Java documentation for <code>android.os.Handler.postAtTime(java.lang.Runnable, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#postAtTime(java.lang.Runnable,%20java.lang.Object,%20long)" title="Reference documentation">Java documentation for <code>android.os.Handler.postAtTime(java.lang.Runnable, java.lang.Object, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1189,12 +1202,26 @@
       <Docs>
         <param name="r">The Runnable that will be executed.</param>
         <param name="delayMillis">The delay (in milliseconds) until the Runnable
-        will be executed.</param>
+                   will be executed.</param>
         <summary>Causes the Runnable r to be added to the message queue, to be run
- after the specified amount of time elapses.</summary>
-        <returns>To be added.</returns>
+            after the specified amount of time elapses.</summary>
+        <returns>Returns true if the Runnable was successfully placed in to the 
+                    message queue.  Returns false on failure, usually because the
+                    looper processing the message queue is exiting.  Note that a
+                    result of true does not mean the Runnable will be processed --
+                    if the looper is quit before the delivery time of the message
+                    occurs then the message will be dropped.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Handler#postDelayed(java.lang.Runnable,%20long)" title="Reference documentation">Java documentation for <code>android.os.Handler.postDelayed(java.lang.Runnable, long)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -1251,12 +1278,31 @@
         <Parameter Name="delayMillis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="r">To be added.</param>
-        <param name="token">To be added.</param>
-        <param name="delayMillis">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="r">The Runnable that will be executed.</param>
+        <param name="token">An instance which can be used to cancel <c>r</c> via
+                    <c>#removeCallbacksAndMessages</c>.</param>
+        <param name="delayMillis">The delay (in milliseconds) until the Runnable
+                   will be executed.</param>
+        <summary>Causes the Runnable r to be added to the message queue, to be run
+            after the specified amount of time elapses.</summary>
+        <returns>Returns true if the Runnable was successfully placed in to the
+                    message queue.  Returns false on failure, usually because the
+                    looper processing the message queue is exiting.  Note that a
+                    result of true does not mean the Runnable will be processed --
+                    if the looper is quit before the delivery time of the message
+                    occurs then the message will be dropped.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Handler#postDelayed(java.lang.Runnable,%20java.lang.Object,%20long)" title="Reference documentation">Java documentation for <code>android.os.Handler.postDelayed(java.lang.Runnable, java.lang.Object, long)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="RemoveCallbacks">
@@ -1349,11 +1395,12 @@
       <Docs>
         <param name="r">To be added.</param>
         <param name="token">To be added.</param>
-        <summary>Remove any pending posts of Runnable r that are in the message queue.</summary>
+        <summary>Remove any pending posts of Runnable &lt;var&gt;r&lt;/var&gt; with Object
+            &lt;var&gt;token&lt;/var&gt; that are in the message queue.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#removeCallbacks(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>android.os.Handler.removeCallbacks(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#removeCallbacks(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.Handler.removeCallbacks(java.lang.Runnable, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1499,12 +1546,12 @@
       <Docs>
         <param name="what">To be added.</param>
         <param name="object">To be added.</param>
-        <summary>Remove any pending posts of messages with code 'what' that are in the
-            message queue.</summary>
+        <summary>Remove any pending posts of messages with code 'what' and whose obj is
+            'object' that are in the message queue.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Handler#removeMessages(int)" title="Reference documentation">Java documentation for <code>android.os.Handler.removeMessages(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Handler#removeMessages(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.Handler.removeMessages(int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/HandlerThread.xml b/docs/Mono.Android/en/Android.OS/HandlerThread.xml
index 9857c63b18..a45473adc0 100644
--- a/docs/Mono.Android/en/Android.OS/HandlerThread.xml
+++ b/docs/Mono.Android/en/Android.OS/HandlerThread.xml
@@ -55,8 +55,6 @@
       </Parameters>
       <Docs>
         <param name="name">To be added.</param>
-        <param name="name&#xA;@param&#xA;@param">priority The priority to run the thread at. The value supplied must be from 
-            <c>android.os.Process</c> and not from java.lang.Thread.</param>
         <summary>Constructs a HandlerThread.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/LimitExceededException.xml b/docs/Mono.Android/en/Android.OS/LimitExceededException.xml
index 63d50ddd6a..e4d9039190 100644
--- a/docs/Mono.Android/en/Android.OS/LimitExceededException.xml
+++ b/docs/Mono.Android/en/Android.OS/LimitExceededException.xml
@@ -86,13 +86,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new <c>LimitExceededException</c> with <c>null</c> as its
-            detail message.</summary>
+        <param name="message">the detail message which is saved for later retrieval
+                           by the <c>#getMessage()</c> method.</param>
+        <summary>Constructs a new <c>LimitExceededException</c> with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/LimitExceededException#LimitExceededException()" title="Reference documentation">Java documentation for <code>android.os.LimitExceededException.LimitExceededException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/LimitExceededException#LimitExceededException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.LimitExceededException.LimitExceededException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Message.xml b/docs/Mono.Android/en/Android.OS/Message.xml
index 00474f082d..58035f7a06 100644
--- a/docs/Mono.Android/en/Android.OS/Message.xml
+++ b/docs/Mono.Android/en/Android.OS/Message.xml
@@ -533,13 +533,13 @@
         <Parameter Name="h" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="h">Handler to assign to the returned Message object's <i>target</i> member.</param>
-        <summary>Return a new Message instance from the global pool.</summary>
-        <returns>To be added.</returns>
+        <param name="h">Handler to assign to the returned Message object's &lt;em&gt;target&lt;/em&gt; member.</param>
+        <summary>Same as <c>#obtain()</c>, but sets the value for the &lt;em&gt;target&lt;/em&gt; member on the Message returned.</summary>
+        <returns>A Message object from the global pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Message#obtain()" title="Reference documentation">Java documentation for <code>android.os.Message.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Message#obtain(android.os.Handler)" title="Reference documentation">Java documentation for <code>android.os.Message.obtain(android.os.Handler)</code>.</a>
             </format>
           </para>
           <para>
@@ -575,12 +575,13 @@
       </Parameters>
       <Docs>
         <param name="orig">Original message to copy.</param>
-        <summary>Return a new Message instance from the global pool.</summary>
-        <returns>To be added.</returns>
+        <summary>Same as <c>#obtain()</c>, but copies the values of an existing
+            message (including its target) into the new one.</summary>
+        <returns>A Message object from the global pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Message#obtain()" title="Reference documentation">Java documentation for <code>android.os.Message.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Message#obtain(android.os.Message)" title="Reference documentation">Java documentation for <code>android.os.Message.obtain(android.os.Message)</code>.</a>
             </format>
           </para>
           <para>
@@ -616,14 +617,15 @@
         <Parameter Name="callback" Type="Java.Lang.IRunnable" />
       </Parameters>
       <Docs>
-        <param name="h">Handler to assign to the returned Message object's <i>target</i> member.</param>
+        <param name="h">Handler to assign to the returned Message object's &lt;em&gt;target&lt;/em&gt; member.</param>
         <param name="callback">Runnable that will execute when the message is handled.</param>
-        <summary>Return a new Message instance from the global pool.</summary>
-        <returns>To be added.</returns>
+        <summary>Same as <c>#obtain(Handler)</c>, but assigns a callback Runnable on
+            the Message that is returned.</summary>
+        <returns>A Message object from the global pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Message#obtain()" title="Reference documentation">Java documentation for <code>android.os.Message.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Message#obtain(android.os.Handler,%20java.lang.Runnable)" title="Reference documentation">Java documentation for <code>android.os.Message.obtain(android.os.Handler, java.lang.Runnable)</code>.</a>
             </format>
           </para>
           <para>
@@ -686,14 +688,15 @@
         <Parameter Name="what" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="h">Value to assign to the <i>target</i> member.</param>
-        <param name="what">Value to assign to the <i>what</i> member.</param>
-        <summary>Return a new Message instance from the global pool.</summary>
-        <returns>To be added.</returns>
+        <param name="h">Value to assign to the &lt;em&gt;target&lt;/em&gt; member.</param>
+        <param name="what">Value to assign to the &lt;em&gt;what&lt;/em&gt; member.</param>
+        <summary>Same as <c>#obtain()</c>, but sets the values for both &lt;em&gt;target&lt;/em&gt; and
+            &lt;em&gt;what&lt;/em&gt; members on the Message.</summary>
+        <returns>A Message object from the global pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Message#obtain()" title="Reference documentation">Java documentation for <code>android.os.Message.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Message#obtain(android.os.Handler,%20int)" title="Reference documentation">Java documentation for <code>android.os.Message.obtain(android.os.Handler, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -730,15 +733,16 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="h">The <i>target</i> value to set.</param>
-        <param name="what">The <i>what</i> value to set.</param>
-        <param name="obj">The <i>object</i> method to set.</param>
-        <summary>Return a new Message instance from the global pool.</summary>
-        <returns>To be added.</returns>
+        <param name="h">The &lt;em&gt;target&lt;/em&gt; value to set.</param>
+        <param name="what">The &lt;em&gt;what&lt;/em&gt; value to set.</param>
+        <param name="obj">The &lt;em&gt;object&lt;/em&gt; method to set.</param>
+        <summary>Same as <c>#obtain()</c>, but sets the values of the &lt;em&gt;target&lt;/em&gt;, &lt;em&gt;what&lt;/em&gt;, and &lt;em&gt;obj&lt;/em&gt;
+            members.</summary>
+        <returns>A Message object from the global pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Message#obtain()" title="Reference documentation">Java documentation for <code>android.os.Message.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Message#obtain(android.os.Handler,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.Message.obtain(android.os.Handler, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -776,16 +780,17 @@
         <Parameter Name="arg2" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="h">The <i>target</i> value to set.</param>
-        <param name="what">The <i>what</i> value to set.</param>
-        <param name="arg1">The <i>arg1</i> value to set.</param>
-        <param name="arg2">The <i>arg2</i> value to set.</param>
-        <summary>Return a new Message instance from the global pool.</summary>
-        <returns>To be added.</returns>
+        <param name="h">The &lt;em&gt;target&lt;/em&gt; value to set.</param>
+        <param name="what">The &lt;em&gt;what&lt;/em&gt; value to set.</param>
+        <param name="arg1">The &lt;em&gt;arg1&lt;/em&gt; value to set.</param>
+        <param name="arg2">The &lt;em&gt;arg2&lt;/em&gt; value to set.</param>
+        <summary>Same as <c>#obtain()</c>, but sets the values of the &lt;em&gt;target&lt;/em&gt;, &lt;em&gt;what&lt;/em&gt;,
+            &lt;em&gt;arg1&lt;/em&gt;, and &lt;em&gt;arg2&lt;/em&gt; members.</summary>
+        <returns>A Message object from the global pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Message#obtain()" title="Reference documentation">Java documentation for <code>android.os.Message.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Message#obtain(android.os.Handler,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.os.Message.obtain(android.os.Handler, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -824,17 +829,18 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="h">The <i>target</i> value to set.</param>
-        <param name="what">The <i>what</i> value to set.</param>
-        <param name="arg1">The <i>arg1</i> value to set.</param>
-        <param name="arg2">The <i>arg2</i> value to set.</param>
-        <param name="obj">The <i>obj</i> value to set.</param>
-        <summary>Return a new Message instance from the global pool.</summary>
-        <returns>To be added.</returns>
+        <param name="h">The &lt;em&gt;target&lt;/em&gt; value to set.</param>
+        <param name="what">The &lt;em&gt;what&lt;/em&gt; value to set.</param>
+        <param name="arg1">The &lt;em&gt;arg1&lt;/em&gt; value to set.</param>
+        <param name="arg2">The &lt;em&gt;arg2&lt;/em&gt; value to set.</param>
+        <param name="obj">The &lt;em&gt;obj&lt;/em&gt; value to set.</param>
+        <summary>Same as <c>#obtain()</c>, but sets the values of the &lt;em&gt;target&lt;/em&gt;, &lt;em&gt;what&lt;/em&gt;,
+            &lt;em&gt;arg1&lt;/em&gt;, &lt;em&gt;arg2&lt;/em&gt;, and &lt;em&gt;obj&lt;/em&gt; members.</summary>
+        <returns>A Message object from the global pool.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Message#obtain()" title="Reference documentation">Java documentation for <code>android.os.Message.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Message#obtain(android.os.Handler,%20int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.Message.obtain(android.os.Handler, int, int, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Messenger.xml b/docs/Mono.Android/en/Android.OS/Messenger.xml
index dedf7fe867..e4976fea40 100644
--- a/docs/Mono.Android/en/Android.OS/Messenger.xml
+++ b/docs/Mono.Android/en/Android.OS/Messenger.xml
@@ -104,12 +104,13 @@
         <Parameter Name="target" Type="Android.OS.IBinder" />
       </Parameters>
       <Docs>
-        <param name="target">The Handler that will receive sent messages.</param>
-        <summary>Create a new Messenger pointing to the given Handler.</summary>
+        <param name="target">The IBinder this Messenger should communicate with.</param>
+        <summary>Create a Messenger from a raw IBinder, which had previously been
+            retrieved with <c>#getBinder</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Messenger#Messenger(android.os.Handler)" title="Reference documentation">Java documentation for <code>android.os.Messenger.Messenger(android.os.Handler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Messenger#Messenger(android.os.IBinder)" title="Reference documentation">Java documentation for <code>android.os.Messenger.Messenger(android.os.IBinder)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Parcel.xml b/docs/Mono.Android/en/Android.OS/Parcel.xml
index ad5a250c95..8d0dc38f3f 100644
--- a/docs/Mono.Android/en/Android.OS/Parcel.xml
+++ b/docs/Mono.Android/en/Android.OS/Parcel.xml
@@ -1245,12 +1245,13 @@
       <Docs>
         <param name="loader">To be added.</param>
         <summary>Read and return a new Bundle object from the parcel at the current
-            dataPosition().</summary>
+            dataPosition(), using the given class loader to initialize the class
+            loader of the Bundle for later retrieval of Parcelable objects.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Parcel#readBundle()" title="Reference documentation">Java documentation for <code>android.os.Parcel.readBundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Parcel#readBundle(java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>android.os.Parcel.readBundle(java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -1509,14 +1510,12 @@
       </Parameters>
       <Docs>
         <param name="code">Used to determine which exception class to throw.</param>
-        <param name="msg">The exception message.
-</param>
-        <summary>Special function for reading an exception result from the header of
-            a parcel, to be used after receiving the result of a transaction.</summary>
+        <param name="msg">The exception message.</param>
+        <summary>Throw an exception with the given message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Parcel#readException()" title="Reference documentation">Java documentation for <code>android.os.Parcel.readException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Parcel#readException(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.os.Parcel.readException(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2149,12 +2148,13 @@
       <Docs>
         <param name="loader">To be added.</param>
         <summary>Read and return a new Bundle object from the parcel at the current
-            dataPosition().</summary>
+            dataPosition(), using the given class loader to initialize the class
+            loader of the Bundle for later retrieval of Parcelable objects.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Parcel#readPersistableBundle()" title="Reference documentation">Java documentation for <code>android.os.Parcel.readPersistableBundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Parcel#readPersistableBundle(java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>android.os.Parcel.readPersistableBundle(java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -3310,16 +3310,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">Index of first byte to be written.</param>
-        <param name="len">Number of bytes to write.
-</param>
         <param name="b">Bytes to place into the parcel.</param>
+        <param name="offset">Index of first byte to be written.</param>
+        <param name="len">Number of bytes to write.</param>
         <summary>Write a byte array into the parcel at the current <c>#dataPosition</c>,
             growing <c>#dataCapacity</c> if needed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Parcel#writeByteArray(byte[])" title="Reference documentation">Java documentation for <code>android.os.Parcel.writeByteArray(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Parcel#writeByteArray(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.os.Parcel.writeByteArray(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor.xml b/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor.xml
index 6019eb8d70..706bb91bda 100644
--- a/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor.xml
+++ b/docs/Mono.Android/en/Android.OS/ParcelFileDescriptor.xml
@@ -639,13 +639,13 @@
       </Parameters>
       <Docs>
         <param name="orig">To be added.</param>
-        <summary>Create a new ParcelFileDescriptor that is a dup of the existing
+        <summary>Create a new ParcelFileDescriptor that is a dup of an existing
             FileDescriptor.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/ParcelFileDescriptor#dup()" title="Reference documentation">Java documentation for <code>android.os.ParcelFileDescriptor.dup()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/ParcelFileDescriptor#dup(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>android.os.ParcelFileDescriptor.dup(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -986,9 +986,6 @@
         <Parameter Name="listener" Type="Android.OS.ParcelFileDescriptor+IOnCloseListener" />
       </Parameters>
       <Docs>
-        <param name="handler">to call listener from; must not be null.</param>
-        <param name="listener">to be invoked when the returned descriptor has been
-            closed; must not be null.</param>
         <param name="file">The file to be opened.</param>
         <param name="mode">The desired access mode, must be one of
                        <c>#MODE_READ_ONLY</c>, <c>#MODE_WRITE_ONLY</c>, or
@@ -996,6 +993,9 @@
                        <c>#MODE_CREATE</c>, <c>#MODE_TRUNCATE</c>,
                        <c>#MODE_WORLD_READABLE</c>, and
                        <c>#MODE_WORLD_WRITEABLE</c>.</param>
+        <param name="handler">to call listener from; must not be null.</param>
+        <param name="listener">to be invoked when the returned descriptor has been
+            closed; must not be null.</param>
         <summary>Create a new ParcelFileDescriptor accessing a given file.</summary>
         <returns>a new ParcelFileDescriptor pointing to the given file.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.OS/PersistableBundle.xml b/docs/Mono.Android/en/Android.OS/PersistableBundle.xml
index a11533f828..d84c205100 100644
--- a/docs/Mono.Android/en/Android.OS/PersistableBundle.xml
+++ b/docs/Mono.Android/en/Android.OS/PersistableBundle.xml
@@ -101,12 +101,13 @@
         <Parameter Name="b" Type="Android.OS.PersistableBundle" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Constructs a new, empty PersistableBundle.</summary>
+        <param name="b">a PersistableBundle to be copied.</param>
+        <summary>Constructs a PersistableBundle containing a copy of the mappings from the given
+            PersistableBundle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/PersistableBundle#PersistableBundle()" title="Reference documentation">Java documentation for <code>android.os.PersistableBundle.PersistableBundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/PersistableBundle#PersistableBundle(android.os.PersistableBundle)" title="Reference documentation">Java documentation for <code>android.os.PersistableBundle.PersistableBundle(android.os.PersistableBundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -137,12 +138,13 @@
         <Parameter Name="capacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="capacity">To be added.</param>
-        <summary>Constructs a new, empty PersistableBundle.</summary>
+        <param name="capacity">the initial capacity of the PersistableBundle</param>
+        <summary>Constructs a new, empty PersistableBundle sized to hold the given number of
+            elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/PersistableBundle#PersistableBundle()" title="Reference documentation">Java documentation for <code>android.os.PersistableBundle.PersistableBundle()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/PersistableBundle#PersistableBundle(int)" title="Reference documentation">Java documentation for <code>android.os.PersistableBundle.PersistableBundle(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/PowerManager.xml b/docs/Mono.Android/en/Android.OS/PowerManager.xml
index 9d5b8f22fb..ddaa23266e 100644
--- a/docs/Mono.Android/en/Android.OS/PowerManager.xml
+++ b/docs/Mono.Android/en/Android.OS/PowerManager.xml
@@ -970,22 +970,20 @@
         <Parameter Name="noChangeLights" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="noChangeLights">If true, does not cause the keyboard backlight to turn on
- because of this event.  This is set when the power key is pressed.
- We want the device to stay on while the button is down, but we're about
- to turn off the screen so we don't want the keyboard backlight to turn on again.
- Otherwise the lights flash on and then off and it looks weird.</param>
         <param name="when">The time of the user activity, in the <c>SystemClock#uptimeMillis()</c>
             time base.  This timestamp is used to correctly order the user activity request with
             other power management functions.  It should be set
             to the timestamp of the input event that caused the user activity.</param>
-        <param name="event">The user activity event.</param>
-        <param name="flags">Optional user activity flags.</param>
+        <param name="noChangeLights">If true, does not cause the keyboard backlight to turn on
+            because of this event.  This is set when the power key is pressed.
+            We want the device to stay on while the button is down, but we're about
+            to turn off the screen so we don't want the keyboard backlight to turn on again.
+            Otherwise the lights flash on and then off and it looks weird.</param>
         <summary>Notifies the power manager that user activity happened.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/PowerManager#userActivity(long,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.os.PowerManager.userActivity(long, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/PowerManager#userActivity(long,%20boolean)" title="Reference documentation">Java documentation for <code>android.os.PowerManager.userActivity(long, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Process.xml b/docs/Mono.Android/en/Android.OS/Process.xml
index 054f6de84a..b33928401c 100644
--- a/docs/Mono.Android/en/Android.OS/Process.xml
+++ b/docs/Mono.Android/en/Android.OS/Process.xml
@@ -1022,11 +1022,11 @@
         <param name="tid">The identifier of the thread/process to change.</param>
         <param name="priority">A Linux priority level, from -20 for highest scheduling
             priority to 19 for lowest scheduling priority.</param>
-        <summary>Set the priority of the calling thread, based on Linux priorities.</summary>
+        <summary>Set the priority of a thread, based on Linux priorities.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Process#setThreadPriority(int)" title="Reference documentation">Java documentation for <code>android.os.Process.setThreadPriority(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Process#setThreadPriority(int,%20int)" title="Reference documentation">Java documentation for <code>android.os.Process.setThreadPriority(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/RemoteCallbackList.xml b/docs/Mono.Android/en/Android.OS/RemoteCallbackList.xml
index 026f92af51..a922ade77e 100644
--- a/docs/Mono.Android/en/Android.OS/RemoteCallbackList.xml
+++ b/docs/Mono.Android/en/Android.OS/RemoteCallbackList.xml
@@ -473,14 +473,17 @@
         <Parameter Name="cookie" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="callback">To be added.</param>
-        <param name="cookie">To be added.</param>
-        <summary>Old version of <c>#onCallbackDied(E, Object)</c> that
-            does not provide a cookie.</summary>
+        <param name="callback">The callback whose process has died.  Note that, since
+            its process has died, you can not make any calls on to this interface.
+            You can, however, retrieve its IBinder and compare it with another
+            IBinder to see if it is the same object.</param>
+        <param name="cookie">The cookie object original provided to
+            <c>#register(E, Object)</c>.</param>
+        <summary>Called when the process hosting a callback in the list has gone away.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/RemoteCallbackList#onCallbackDied(android.os.IInterface)" title="Reference documentation">Java documentation for <code>android.os.RemoteCallbackList.onCallbackDied(android.os.IInterface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/RemoteCallbackList#onCallbackDied(android.os.IInterface,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.RemoteCallbackList.onCallbackDied(android.os.IInterface, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -556,15 +559,21 @@
         <Parameter Name="cookie" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="callback">To be added.</param>
-        <param name="cookie">To be added.</param>
-        <summary>Simple version of <c>RemoteCallbackList#register(E, Object)</c>
-            that does not take a cookie object.</summary>
-        <returns>To be added.</returns>
+        <param name="callback">The callback interface to be added to the list.  Must
+            not be null -- passing null here will cause a NullPointerException.
+            Most services will want to check for null before calling this with
+            an object given from a client, so that clients can't crash the
+            service with bad data.</param>
+        <param name="cookie">Optional additional data to be associated with this
+            callback.</param>
+        <summary>Add a new callback to the list.</summary>
+        <returns>Returns true if the callback was successfully added to the list.
+            Returns false if it was not added, either because <c>#kill</c> had
+            previously been called or the callback's process has gone away.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/RemoteCallbackList#register(android.os.IInterface)" title="Reference documentation">Java documentation for <code>android.os.RemoteCallbackList.register(android.os.IInterface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/RemoteCallbackList#register(android.os.IInterface,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.os.RemoteCallbackList.register(android.os.IInterface, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/TestLooperManager.xml b/docs/Mono.Android/en/Android.OS/TestLooperManager.xml
index bfc0dcaafe..86dd587a63 100644
--- a/docs/Mono.Android/en/Android.OS/TestLooperManager.xml
+++ b/docs/Mono.Android/en/Android.OS/TestLooperManager.xml
@@ -122,16 +122,15 @@
         <Parameter Name="r" Type="Java.Lang.IRunnable" />
       </Parameters>
       <Docs>
-        <param name="r">To be added.</param>
         <param name="h">the value of <c>Message#getTarget()</c></param>
-        <param name="what">the value of <c>Message#what</c></param>
+        <param name="r">the value of <c>Message#getCallback()</c></param>
         <param name="object">the value of <c>Message#obj</c>, null for any</param>
         <summary>Returns true if there are any queued messages that match the parameters.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/TestLooperManager#hasMessages(android.os.Handler,%20java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>android.os.TestLooperManager.hasMessages(android.os.Handler, java.lang.Object, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/TestLooperManager#hasMessages(android.os.Handler,%20java.lang.Object,%20java.lang.Runnable)" title="Reference documentation">Java documentation for <code>android.os.TestLooperManager.hasMessages(android.os.Handler, java.lang.Object, java.lang.Runnable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/UserHandle.xml b/docs/Mono.Android/en/Android.OS/UserHandle.xml
index d357f6069b..09dae06e27 100644
--- a/docs/Mono.Android/en/Android.OS/UserHandle.xml
+++ b/docs/Mono.Android/en/Android.OS/UserHandle.xml
@@ -67,11 +67,21 @@
         <Parameter Name="in" Type="Android.OS.Parcel" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
+        <param name="in">The Parcel containing the previously written UserHandle,
+            positioned at the location in the buffer where it was written.</param>
         <summary>Instantiate a new UserHandle from the data in a Parcel that was
- previously written with <see cref="M:Android.OS.UserHandle.WriteToParcel(Android.OS.Parcel,Android.OS.ParcelableWriteFlags)" />.</summary>
+            previously written with <c>#writeToParcel(Parcel, int)</c>.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/UserHandle#UserHandle(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.os.UserHandle.UserHandle(android.os.Parcel)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 17" />
       </Docs>
@@ -353,11 +363,10 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="out">The Parcel in which the UserHandle will be placed.</param>
         <param name="flags">Additional flags about how the object should be written.
  May be 0 or <see cref="F:Android.OS.Parcelable.ParcelableWriteReturnValue" />.
 </param>
-        <param name="h">The UserHandle to be written.</param>
-        <param name="out">The Parcel in which the UserHandle will be placed.</param>
         <summary>Write a UserHandle to a Parcel, handling null pointers.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/UserManager.xml b/docs/Mono.Android/en/Android.OS/UserManager.xml
index 84589a215d..0c5756980f 100644
--- a/docs/Mono.Android/en/Android.OS/UserManager.xml
+++ b/docs/Mono.Android/en/Android.OS/UserManager.xml
@@ -2384,12 +2384,16 @@
       </Parameters>
       <Docs>
         <param name="userHandle">the UserHandle of the user for whom to retrieve the restrictions.</param>
-        <summary>Returns the user-wide restrictions imposed on this user.</summary>
-        <returns>a Bundle containing all the restrictions.</returns>
+        <summary>Returns the user-wide restrictions imposed on the user specified by &lt;code&gt;userHandle&lt;/code&gt;.</summary>
+        <returns>a Bundle containing all the restrictions.
+            
+            &lt;p&gt;Requires <c>android.permission.MANAGE_USERS</c> or
+            <c>android.permission.INTERACT_ACROSS_USERS</c>, otherwise specified <c>UserHandle user</c>
+            must be the calling user or a profile associated with it.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/UserManager#getUserRestrictions()" title="Reference documentation">Java documentation for <code>android.os.UserManager.getUserRestrictions()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/UserManager#getUserRestrictions(android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.os.UserManager.getUserRestrictions(android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
@@ -2473,13 +2477,13 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="user">To be added.</param>
-        <summary>Return whether the calling user is running in an "unlocked" state.</summary>
+        <param name="user">to retrieve the unlocked state for.</param>
+        <summary>Return whether the given user is running in an "unlocked" state.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/UserManager#isUserUnlocked()" title="Reference documentation">Java documentation for <code>android.os.UserManager.isUserUnlocked()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/UserManager#isUserUnlocked(android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.os.UserManager.isUserUnlocked(android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
@@ -2771,12 +2775,20 @@
         <Parameter Name="user" Type="Android.OS.UserHandle" />
       </Parameters>
       <Docs>
-        <param name="user">The user to retrieve the running state for.
-</param>
+        <param name="user">The user to retrieve the running state for.</param>
         <summary>Return whether the given user is actively running.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/UserManager#isUserRunning(android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.os.UserManager.isUserRunning(android.os.UserHandle)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 17" />
       </Docs>
@@ -3042,17 +3054,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
         <param name="enableQuietMode">whether quiet mode should be enabled or disabled</param>
         <param name="userHandle">user handle of the profile</param>
-        <summary>Enables or disables quiet mode for a managed profile.</summary>
+        <param name="flags">Can be 0 or <c>#QUIET_MODE_DISABLE_ONLY_IF_CREDENTIAL_NOT_REQUIRED</c>.</param>
+        <summary>Perform the same operation as <c>#requestQuietModeEnabled(boolean, UserHandle)</c>, but
+            with a flag to tweak the behavior of the request.</summary>
         <returns>
           <c>false</c> if user's credential is needed in order to turn off quiet mode,
                     <c>true</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/UserManager#requestQuietModeEnabled(boolean,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.os.UserManager.requestQuietModeEnabled(boolean, android.os.UserHandle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/UserManager#requestQuietModeEnabled(boolean,%20android.os.UserHandle,%20int)" title="Reference documentation">Java documentation for <code>android.os.UserManager.requestQuietModeEnabled(boolean, android.os.UserHandle, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3191,7 +3204,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/UserManager#setUserRestrictions(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.os.UserManager.setUserRestrictions(android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/UserManager#setUserRestrictions(android.os.Bundle,%20android.os.UserHandle)" title="Reference documentation">Java documentation for <code>android.os.UserManager.setUserRestrictions(android.os.Bundle, android.os.UserHandle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/VibrationEffect.xml b/docs/Mono.Android/en/Android.OS/VibrationEffect.xml
index 610bb1f635..540614e8fa 100644
--- a/docs/Mono.Android/en/Android.OS/VibrationEffect.xml
+++ b/docs/Mono.Android/en/Android.OS/VibrationEffect.xml
@@ -229,9 +229,11 @@
         <Parameter Name="repeat" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="amplitudes">To be added.</param>
-        <param name="timings">The pattern of alternating on-off timings, starting with off. Timing values
-                           of 0 will cause the timing / amplitude pair to be ignored.</param>
+        <param name="timings">The timing values, in milliseconds, of the timing / amplitude pairs. Timing
+                           values of 0 will cause the pair to be ignored.</param>
+        <param name="amplitudes">The amplitude values of the timing / amplitude pairs. Amplitude values
+                              must be between 0 and 255, or equal to <c>#DEFAULT_AMPLITUDE</c>. An
+                              amplitude value of 0 implies the motor is off.</param>
         <param name="repeat">The index into the timings array at which to repeat, or -1 if you you don't
                           want to repeat.</param>
         <summary>Create a waveform vibration.</summary>
@@ -239,7 +241,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/VibrationEffect#createWaveform(long[],%20int)" title="Reference documentation">Java documentation for <code>android.os.VibrationEffect.createWaveform(long[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/VibrationEffect#createWaveform(long[],%20int[],%20int)" title="Reference documentation">Java documentation for <code>android.os.VibrationEffect.createWaveform(long[], int[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.OS/Vibrator.xml b/docs/Mono.Android/en/Android.OS/Vibrator.xml
index 4ce0199fa1..972bf18dc2 100644
--- a/docs/Mono.Android/en/Android.OS/Vibrator.xml
+++ b/docs/Mono.Android/en/Android.OS/Vibrator.xml
@@ -93,7 +93,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Vibrator#areAllEffectsSupported(int)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.areAllEffectsSupported(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Vibrator#areAllEffectsSupported(int[])" title="Reference documentation">Java documentation for <code>android.os.Vibrator.areAllEffectsSupported(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -140,7 +140,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Vibrator#areAllPrimitivesSupported(int)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.areAllPrimitivesSupported(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Vibrator#areAllPrimitivesSupported(int[])" title="Reference documentation">Java documentation for <code>android.os.Vibrator.areAllPrimitivesSupported(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -188,7 +188,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Vibrator#areEffectsSupported(int)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.areEffectsSupported(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Vibrator#areEffectsSupported(int[])" title="Reference documentation">Java documentation for <code>android.os.Vibrator.areEffectsSupported(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -235,7 +235,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Vibrator#arePrimitivesSupported(int)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.arePrimitivesSupported(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Vibrator#arePrimitivesSupported(int[])" title="Reference documentation">Java documentation for <code>android.os.Vibrator.arePrimitivesSupported(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -348,7 +348,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/Vibrator#getPrimitiveDurations(int)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.getPrimitiveDurations(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/Vibrator#getPrimitiveDurations(int[])" title="Reference documentation">Java documentation for <code>android.os.Vibrator.getPrimitiveDurations(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -609,11 +609,19 @@
         <Parameter Name="milliseconds" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="milliseconds">The number of milliseconds to vibrate.
-</param>
+        <param name="milliseconds">The number of milliseconds to vibrate.</param>
         <summary>Vibrate constantly for the specified period of time.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Vibrator#vibrate(long)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.vibrate(long)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 21" />
       </Docs>
@@ -688,14 +696,22 @@
       <Docs>
         <param name="milliseconds">The number of milliseconds to vibrate.</param>
         <param name="attributes">
-          <see cref="T:Android.Media.AudioAttributes" /> corresponding to the vibration. For example,
-        specify <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Media AudioAttributes USAGE_ALARM';scope=Xamarin" title="Android.Media.AudioAttributes.USAGE_ALARM">Android.Media.AudioAttributes.USAGE_ALARM</a></format> for alarm vibrations or
-        <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Media AudioAttributes USAGE_NOTIFICATION_RINGTONE';scope=Xamarin" title="Android.Media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE">Android.Media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE</a></format> for
-        vibrations associated with incoming calls.
-</param>
+          <c>AudioAttributes</c> corresponding to the vibration. For example,
+                                specify <c>AudioAttributes#USAGE_ALARM</c> for alarm vibrations or
+                                <c>AudioAttributes#USAGE_NOTIFICATION_RINGTONE</c> for
+                                vibrations associated with incoming calls.</param>
         <summary>Vibrate constantly for the specified period of time.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Vibrator#vibrate(long,%20android.media.AudioAttributes)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.vibrate(long, android.media.AudioAttributes)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -733,11 +749,19 @@
       <Docs>
         <param name="pattern">an array of longs of times for which to turn the vibrator on or off.</param>
         <param name="repeat">the index into pattern at which to repeat, or -1 if
-        you don't want to repeat.
-</param>
+                           you don't want to repeat.</param>
         <summary>Vibrate with a given pattern.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Vibrator#vibrate(long[],%20int)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.vibrate(long[], int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -777,16 +801,24 @@
       <Docs>
         <param name="pattern">an array of longs of times for which to turn the vibrator on or off.</param>
         <param name="repeat">the index into pattern at which to repeat, or -1 if
-        you don't want to repeat.</param>
+                              you don't want to repeat.</param>
         <param name="attributes">
-          <see cref="T:Android.Media.AudioAttributes" /> corresponding to the vibration. For example,
-        specify <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Media AudioAttributes USAGE_ALARM';scope=Xamarin" title="Android.Media.AudioAttributes.USAGE_ALARM">Android.Media.AudioAttributes.USAGE_ALARM</a></format> for alarm vibrations or
-        <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Media AudioAttributes USAGE_NOTIFICATION_RINGTONE';scope=Xamarin" title="Android.Media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE">Android.Media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE</a></format> for
-        vibrations associated with incoming calls.
-</param>
+          <c>AudioAttributes</c> corresponding to the vibration. For example,
+                              specify <c>AudioAttributes#USAGE_ALARM</c> for alarm vibrations or
+                              <c>AudioAttributes#USAGE_NOTIFICATION_RINGTONE</c> for
+                              vibrations associated with incoming calls.</param>
         <summary>Vibrate with a given pattern.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/Vibrator#vibrate(long[],%20int,%20android.media.AudioAttributes)" title="Reference documentation">Java documentation for <code>android.os.Vibrator.vibrate(long[], int, android.media.AudioAttributes)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.OS/VibratorManager.xml b/docs/Mono.Android/en/Android.OS/VibratorManager.xml
index 12bdb6b529..cbfd44a194 100644
--- a/docs/Mono.Android/en/Android.OS/VibratorManager.xml
+++ b/docs/Mono.Android/en/Android.OS/VibratorManager.xml
@@ -311,9 +311,20 @@
         <Parameter Name="effect" Type="Android.OS.CombinedVibration" />
       </Parameters>
       <Docs>
-        <param name="effect">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="effect">a combination of effects to be performed by one or more vibrators.</param>
+        <summary>Vibrate with a given combination of effects.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/VibratorManager#vibrate(android.os.CombinedVibration)" title="Reference documentation">Java documentation for <code>android.os.VibratorManager.vibrate(android.os.CombinedVibration)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Vibrate">
@@ -344,10 +355,25 @@
         <Parameter Name="attributes" Type="Android.OS.VibrationAttributes" />
       </Parameters>
       <Docs>
-        <param name="effect">To be added.</param>
-        <param name="attributes">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="effect">a combination of effects to be performed by one or more vibrators.</param>
+        <param name="attributes">
+          <c>VibrationAttributes</c> corresponding to the vibration. For example,
+                              specify <c>VibrationAttributes#USAGE_ALARM</c> for alarm vibrations or
+                              <c>VibrationAttributes#USAGE_RINGTONE</c> for vibrations associated with
+                              incoming calls.</param>
+        <summary>Vibrate with a given combination of effects.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/VibratorManager#vibrate(android.os.CombinedVibration,%20android.os.VibrationAttributes)" title="Reference documentation">Java documentation for <code>android.os.VibratorManager.vibrate(android.os.CombinedVibration, android.os.VibrationAttributes)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/Mono.Android/en/Android.OS/WorkSource.xml b/docs/Mono.Android/en/Android.OS/WorkSource.xml
index 833fe8fee8..1ef96e36d8 100644
--- a/docs/Mono.Android/en/Android.OS/WorkSource.xml
+++ b/docs/Mono.Android/en/Android.OS/WorkSource.xml
@@ -101,11 +101,11 @@
       </Parameters>
       <Docs>
         <param name="orig">To be added.</param>
-        <summary>Create an empty work source.</summary>
+        <summary>Create a new WorkSource that is a copy of an existing one.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/os/WorkSource#WorkSource()" title="Reference documentation">Java documentation for <code>android.os.WorkSource.WorkSource()</code>.</a>
+              <a href="https://developer.android.com/reference/android/os/WorkSource#WorkSource(android.os.WorkSource)" title="Reference documentation">Java documentation for <code>android.os.WorkSource.WorkSource(android.os.WorkSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -164,10 +164,19 @@
       </Parameters>
       <Docs>
         <param name="other">The other WorkSource whose contents are to be merged.</param>
-        <summary>Merge the contents of <format type="text/html"><var>other</var></format> WorkSource in to this one.</summary>
-        <returns>To be added.</returns>
+        <summary>Merge the contents of &lt;var&gt;other&lt;/var&gt; WorkSource in to this one.</summary>
+        <returns>Returns true if any new sources were added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/WorkSource#add(android.os.WorkSource)" title="Reference documentation">Java documentation for <code>android.os.WorkSource.add(android.os.WorkSource)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 9" />
       </Docs>
@@ -404,9 +413,18 @@
       <Docs>
         <param name="other">To be added.</param>
         <summary>Replace the current contents of this work source with the given
- work source.</summary>
+            work source.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/os/WorkSource#set(android.os.WorkSource)" title="Reference documentation">Java documentation for <code>android.os.WorkSource.set(android.os.WorkSource)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 9" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Opengl/ETC1Util.xml b/docs/Mono.Android/en/Android.Opengl/ETC1Util.xml
index 3f20e5bb57..5e2af7ddc9 100644
--- a/docs/Mono.Android/en/Android.Opengl/ETC1Util.xml
+++ b/docs/Mono.Android/en/Android.Opengl/ETC1Util.xml
@@ -314,7 +314,6 @@
         <Parameter Name="input" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="input">the input stream containing an ETC1 texture in PKM format.</param>
         <param name="target">the texture target.</param>
         <param name="level">the texture level</param>
         <param name="border">the border size. Typically 0.</param>
@@ -323,7 +322,7 @@
         <param name="fallbackType">the type to use if ETC1 texture compression is not supported.
             Can be either GL_UNSIGNED_SHORT_5_6_5, which implies 16-bits-per-pixel,
             or GL_UNSIGNED_BYTE, which implies 24-bits-per-pixel.</param>
-        <param name="texture">the ETC1 to load.</param>
+        <param name="input">the input stream containing an ETC1 texture in PKM format.</param>
         <summary>Convenience method to load an ETC1 texture whether or not the active OpenGL context
             supports the ETC1 texture compression format.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Opengl/GLDebugHelper.xml b/docs/Mono.Android/en/Android.Opengl/GLDebugHelper.xml
index fcdadd894d..ea609dbc1b 100644
--- a/docs/Mono.Android/en/Android.Opengl/GLDebugHelper.xml
+++ b/docs/Mono.Android/en/Android.Opengl/GLDebugHelper.xml
@@ -409,18 +409,17 @@
         <Parameter Name="log" Type="Java.IO.Writer" />
       </Parameters>
       <Docs>
-        <param name="gl">To be added.</param>
-        <param name="egl">the existing GL interface. Must implement EGL and EGL10. May
-            optionally implement EGL11 as well.</param>
+        <param name="gl">the existing GL interface. Must implement GL and GL10. May
+            optionally implement GL11 as well.</param>
         <param name="configFlags">A bitmask of error checking flags.</param>
         <param name="log">- null to disable logging, non-null to enable logging.</param>
-        <summary>Wrap an existing EGL interface in a new EGL interface that adds
-            support for error checking and/or logging.</summary>
-        <returns>the wrapped EGL interface.</returns>
+        <summary>Wrap an existing GL interface in a new GL interface that adds support for
+            error checking and/or logging.</summary>
+        <returns>the wrapped GL instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/opengl/GLDebugHelper#wrap(javax.microedition.khronos.egl.EGL,%20int,%20java.io.Writer)" title="Reference documentation">Java documentation for <code>android.opengl.GLDebugHelper.wrap(javax.microedition.khronos.egl.EGL, int, java.io.Writer)</code>.</a>
+              <a href="https://developer.android.com/reference/android/opengl/GLDebugHelper#wrap(javax.microedition.khronos.opengles.GL,%20int,%20java.io.Writer)" title="Reference documentation">Java documentation for <code>android.opengl.GLDebugHelper.wrap(javax.microedition.khronos.opengles.GL, int, java.io.Writer)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Opengl/GLSurfaceView.xml b/docs/Mono.Android/en/Android.Opengl/GLSurfaceView.xml
index 1fcaa1f63e..846452b881 100644
--- a/docs/Mono.Android/en/Android.Opengl/GLSurfaceView.xml
+++ b/docs/Mono.Android/en/Android.Opengl/GLSurfaceView.xml
@@ -111,7 +111,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/opengl/GLSurfaceView#GLSurfaceView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.opengl.GLSurfaceView.GLSurfaceView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/opengl/GLSurfaceView#GLSurfaceView(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.opengl.GLSurfaceView.GLSurfaceView(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Opengl/GLUtils.xml b/docs/Mono.Android/en/Android.Opengl/GLUtils.xml
index f557d0fb3d..6492d94711 100644
--- a/docs/Mono.Android/en/Android.Opengl/GLUtils.xml
+++ b/docs/Mono.Android/en/Android.Opengl/GLUtils.xml
@@ -223,10 +223,21 @@
         <param name="level">To be added.</param>
         <param name="bitmap">To be added.</param>
         <param name="border">To be added.</param>
-        <summary tool="true">A version of texImage2D that determines the internalFormat and type
- automatically.</summary>
+        <param name="target&#xA;@param&#xA;@param">level</param>
+        <param name="bitmap&#xA;@param&#xA;@param">border</param>
+        <summary>A version of texImage2D that determines the internalFormat and type
+            automatically.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/opengl/GLUtils#texImage2D(int,%20int,%20android.graphics.Bitmap,%20int)" title="Reference documentation">Java documentation for <code>android.opengl.GLUtils.texImage2D(int, int, android.graphics.Bitmap, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -304,10 +315,22 @@
         <param name="bitmap">To be added.</param>
         <param name="type">To be added.</param>
         <param name="border">To be added.</param>
+        <param name="target&#xA;@param&#xA;@param">level</param>
+        <param name="internalformat&#xA;@param&#xA;@param">bitmap</param>
+        <param name="type&#xA;@param&#xA;@param">border</param>
         <summary>A version of texImage2D() that takes an explicit type parameter
- as defined by the OpenGL ES specification.</summary>
+            as defined by the OpenGL ES specification.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/opengl/GLUtils#texImage2D(int,%20int,%20int,%20android.graphics.Bitmap,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.opengl.GLUtils.texImage2D(int, int, int, android.graphics.Bitmap, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -387,10 +410,22 @@
         <param name="bitmap">To be added.</param>
         <param name="format">To be added.</param>
         <param name="type">To be added.</param>
+        <param name="target&#xA;@param&#xA;@param">level</param>
+        <param name="xoffset&#xA;@param&#xA;@param">yoffset</param>
+        <param name="bitmap&#xA;@param&#xA;@param">type</param>
         <summary>A version of texSubImage2D() that takes an explicit type parameter
- as defined by the OpenGL ES specification.</summary>
+            as defined by the OpenGL ES specification.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/opengl/GLUtils#texSubImage2D(int,%20int,%20int,%20int,%20android.graphics.Bitmap,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.opengl.GLUtils.texSubImage2D(int, int, int, int, android.graphics.Bitmap, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Opengl/Matrix.xml b/docs/Mono.Android/en/Android.Opengl/Matrix.xml
index f83c807b4c..d1f48899af 100644
--- a/docs/Mono.Android/en/Android.Opengl/Matrix.xml
+++ b/docs/Mono.Android/en/Android.Opengl/Matrix.xml
@@ -573,17 +573,16 @@
         <param name="rm">returns the result</param>
         <param name="rmOffset">index into rm where the result matrix starts</param>
         <param name="m">source matrix</param>
-        <param name="mOffset">index into m where the matrix starts</param>
+        <param name="mOffset">index into m where the source matrix starts</param>
         <param name="a">angle to rotate in degrees</param>
         <param name="x">X axis component</param>
         <param name="y">Y axis component</param>
         <param name="z">Z axis component</param>
-        <summary>Rotates matrix m in place by angle a (in degrees)
-            around the axis (x, y, z).</summary>
+        <summary>Rotates matrix m by angle a (in degrees) around the axis (x, y, z).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/opengl/Matrix#rotateM(float[],%20int,%20float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.opengl.Matrix.rotateM(float[], int, float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/opengl/Matrix#rotateM(float[],%20int,%20float[],%20int,%20float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.opengl.Matrix.rotateM(float[], int, float[], int, float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -674,16 +673,16 @@
       <Docs>
         <param name="sm">returns the result</param>
         <param name="smOffset">index into sm where the result matrix starts</param>
-        <param name="m">matrix to scale</param>
-        <param name="mOffset">index into m where the matrix starts</param>
+        <param name="m">source matrix</param>
+        <param name="mOffset">index into m where the source matrix starts</param>
         <param name="x">scale factor x</param>
         <param name="y">scale factor y</param>
         <param name="z">scale factor z</param>
-        <summary>Scales matrix m in place by sx, sy, and sz.</summary>
+        <summary>Scales matrix m by x, y, and z, putting the result in sm.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/opengl/Matrix#scaleM(float[],%20int,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.opengl.Matrix.scaleM(float[], int, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/opengl/Matrix#scaleM(float[],%20int,%20float[],%20int,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.opengl.Matrix.scaleM(float[], int, float[], int, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1038,16 +1037,16 @@
       <Docs>
         <param name="tm">returns the result</param>
         <param name="tmOffset">index into sm where the result matrix starts</param>
-        <param name="m">matrix</param>
-        <param name="mOffset">index into m where the matrix starts</param>
+        <param name="m">source matrix</param>
+        <param name="mOffset">index into m where the source matrix starts</param>
         <param name="x">translation factor x</param>
         <param name="y">translation factor y</param>
         <param name="z">translation factor z</param>
-        <summary>Translates matrix m by x, y, and z in place.</summary>
+        <summary>Translates matrix m by x, y, and z, putting the result in tm.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/opengl/Matrix#translateM(float[],%20int,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.opengl.Matrix.translateM(float[], int, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/opengl/Matrix#translateM(float[],%20int,%20float[],%20int,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.opengl.Matrix.translateM(float[], int, float[], int, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/DialogPreference.xml b/docs/Mono.Android/en/Android.Preferences/DialogPreference.xml
index 6936e3b3c5..80c3abc18b 100644
--- a/docs/Mono.Android/en/Android.Preferences/DialogPreference.xml
+++ b/docs/Mono.Android/en/Android.Preferences/DialogPreference.xml
@@ -292,8 +292,8 @@
         <ReturnType>Android.Graphics.Drawables.Drawable</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="dialogIconRes">The icon, as a resource ID.</param>
-        <summary>Returns the icon to be shown on subsequent dialogs. -or- Sets the icon (resource ID) of the dialog.</summary>
+        <param name="dialogIcon">The icon, as a <c>Drawable</c>.</param>
+        <summary>Returns the icon to be shown on subsequent dialogs. -or- Sets the icon of the dialog.</summary>
         <value>The icon, as a <c>Drawable</c>.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -305,7 +305,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setDialogIcon(int)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setDialogIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setDialogIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setDialogIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -422,8 +422,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="dialogMessageResId">The dialog message as a resource.</param>
-        <summary>Returns the message to be shown on subsequent dialogs.</summary>
+        <param name="dialogMessage">The message.</param>
+        <summary>Returns the message to be shown on subsequent dialogs. -or- Sets the message of the dialog.</summary>
         <value>The message.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -435,7 +435,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setDialogMessage(int)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setDialogMessage(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setDialogMessage(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setDialogMessage(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -496,8 +496,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="dialogTitleResId">The dialog title as a resource.</param>
-        <summary>Returns the title to be shown on subsequent dialogs.</summary>
+        <param name="dialogTitle">The title.</param>
+        <summary>Returns the title to be shown on subsequent dialogs. -or- Sets the title of the dialog.</summary>
         <value>The title.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -509,7 +509,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setDialogTitle(int)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setDialogTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setDialogTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setDialogTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -604,9 +604,9 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="negativeButtonTextResId">The negative button text as a resource.</param>
+        <param name="negativeButtonText">The text of the negative button.</param>
         <summary>Returns the text of the negative button to be shown on subsequent
-            dialogs.</summary>
+            dialogs. -or- Sets the text of the negative button of the dialog.</summary>
         <value>The text of the negative button.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -618,7 +618,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setNegativeButtonText(int)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setNegativeButtonText(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setNegativeButtonText(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setNegativeButtonText(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -984,9 +984,9 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="positiveButtonTextResId">The positive button text as a resource.</param>
+        <param name="positiveButtonText">The text of the positive button.</param>
         <summary>Returns the text of the positive button to be shown on subsequent
-            dialogs.</summary>
+            dialogs. -or- Sets the text of the positive button of the dialog.</summary>
         <value>The text of the positive button.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -998,7 +998,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setPositiveButtonText(int)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setPositiveButtonText(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/DialogPreference#setPositiveButtonText(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.DialogPreference.setPositiveButtonText(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/ListPreference.xml b/docs/Mono.Android/en/Android.Preferences/ListPreference.xml
index 179eafddca..d29f1fbb25 100644
--- a/docs/Mono.Android/en/Android.Preferences/ListPreference.xml
+++ b/docs/Mono.Android/en/Android.Preferences/ListPreference.xml
@@ -528,12 +528,11 @@
       </Parameters>
       <Docs>
         <param name="entries">The entries.</param>
-        <param name="entriesResId">The entries array as a resource.</param>
         <summary>Sets the human-readable entries to be shown in the list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntries(int)" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntries(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntries(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntries(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
@@ -615,13 +614,12 @@
         <Parameter Name="entries" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="entries">To be added.</param>
-        <param name="entriesResId">The entries array as a resource.</param>
-        <summary>To be added.</summary>
+        <param name="entries">The entries.</param>
+        <summary>Sets the human-readable entries to be shown in the list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntries(int)" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntries(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntries(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntries(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
@@ -659,15 +657,13 @@
         <Parameter Name="entryValues" Type="Java.Lang.ICharSequence[]" />
       </Parameters>
       <Docs>
-        <param name="entryValues">The array to be used as values to save for the preference.
-</param>
-        <param name="entryValuesResId">The entry values array as a resource.</param>
+        <param name="entryValues">The array to be used as values to save for the preference.</param>
         <summary>The array to find the value to save for a preference when an entry from
- entries is selected.</summary>
+            entries is selected.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntryValues(int)" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntryValues(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntryValues(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntryValues(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
@@ -748,13 +744,13 @@
         <Parameter Name="entryValues" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="entryValues">To be added.</param>
-        <param name="entryValuesResId">The entry values array as a resource.</param>
-        <summary>To be added.</summary>
+        <param name="entryValues">The array to be used as values to save for the preference.</param>
+        <summary>The array to find the value to save for a preference when an entry from
+            entries is selected.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntryValues(int)" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntryValues(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/ListPreference#setEntryValues(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.ListPreference.setEntryValues(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/MultiSelectListPreference.xml b/docs/Mono.Android/en/Android.Preferences/MultiSelectListPreference.xml
index c107e2799b..b88ff85ede 100644
--- a/docs/Mono.Android/en/Android.Preferences/MultiSelectListPreference.xml
+++ b/docs/Mono.Android/en/Android.Preferences/MultiSelectListPreference.xml
@@ -466,12 +466,11 @@
       </Parameters>
       <Docs>
         <param name="entries">The entries.</param>
-        <param name="entriesResId">The entries array as a resource.</param>
         <summary>Sets the human-readable entries to be shown in the list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntries(int)" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntries(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntries(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntries(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
@@ -553,13 +552,12 @@
         <Parameter Name="entries" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="entries">To be added.</param>
-        <param name="entriesResId">The entries array as a resource.</param>
-        <summary>To be added.</summary>
+        <param name="entries">The entries.</param>
+        <summary>Sets the human-readable entries to be shown in the list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntries(int)" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntries(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntries(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntries(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
@@ -597,15 +595,13 @@
         <Parameter Name="entryValues" Type="Java.Lang.ICharSequence[]" />
       </Parameters>
       <Docs>
-        <param name="entryValues">The array to be used as values to save for the preference.
-</param>
-        <param name="entryValuesResId">The entry values array as a resource.</param>
+        <param name="entryValues">The array to be used as values to save for the preference.</param>
         <summary>The array to find the value to save for a preference when an entry from
- entries is selected.</summary>
+            entries is selected.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntryValues(int)" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntryValues(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntryValues(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntryValues(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
@@ -686,13 +682,13 @@
         <Parameter Name="entryValues" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="entryValues">To be added.</param>
-        <param name="entryValuesResId">The entry values array as a resource.</param>
-        <summary>To be added.</summary>
+        <param name="entryValues">The array to be used as values to save for the preference.</param>
+        <summary>The array to find the value to save for a preference when an entry from
+            entries is selected.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntryValues(int)" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntryValues(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/MultiSelectListPreference#setEntryValues(java.lang.CharSequence[])" title="Reference documentation">Java documentation for <code>android.preference.MultiSelectListPreference.setEntryValues(java.lang.CharSequence[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/Preference.xml b/docs/Mono.Android/en/Android.Preferences/Preference.xml
index e798247419..fc4713dc8a 100644
--- a/docs/Mono.Android/en/Android.Preferences/Preference.xml
+++ b/docs/Mono.Android/en/Android.Preferences/Preference.xml
@@ -119,13 +119,16 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="context">The Context in which to store Preference values.</param>
-        <summary>Constructor to create a Preference.</summary>
+        <param name="context">The Context this is associated with, through which it can
+                       access the current theme, resources, <c>SharedPreferences</c>,
+                       etc.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the
+                       preference.</param>
+        <summary>Constructor that is called when inflating a Preference from XML.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/Preference#Preference(android.content.Context)" title="Reference documentation">Java documentation for <code>android.preference.Preference.Preference(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/Preference#Preference(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.preference.Preference.Preference(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,14 +190,19 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="context">The Context in which to store Preference values.</param>
-        <summary>Constructor to create a Preference.</summary>
+        <param name="context">The Context this is associated with, through which it can
+                       access the current theme, resources,
+                       <c>SharedPreferences</c>, etc.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the
+                       preference.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                       reference to a style resource that supplies default values for
+                       the view. Can be 0 to not look for defaults.</param>
+        <summary>Perform inflation from XML and apply a class-specific base style.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/Preference#Preference(android.content.Context)" title="Reference documentation">Java documentation for <code>android.preference.Preference.Preference(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/Preference#Preference(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.preference.Preference.Preference(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -234,15 +242,23 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
-        <param name="context">The Context in which to store Preference values.</param>
-        <summary>Constructor to create a Preference.</summary>
+        <param name="context">The Context this is associated with, through which it can
+                       access the current theme, resources,
+                       <c>SharedPreferences</c>, etc.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the
+                       preference.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                       reference to a style resource that supplies default values for
+                       the view. Can be 0 to not look for defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                       supplies default values for the view, used only if
+                       defStyleAttr is 0 or can not be found in the theme. Can be 0
+                       to not look for defaults.</param>
+        <summary>Perform inflation from XML and apply a class-specific base style.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/Preference#Preference(android.content.Context)" title="Reference documentation">Java documentation for <code>android.preference.Preference.Preference(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/Preference#Preference(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.preference.Preference.Preference(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1137,8 +1153,8 @@
         <ReturnType>Android.Graphics.Drawables.Drawable</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="iconResId">the icon as a resource ID</param>
-        <summary>Returns the icon of this Preference. -or- Sets the icon for this Preference with a resource ID.</summary>
+        <param name="icon">the optional icon for this Preference</param>
+        <summary>Returns the icon of this Preference. -or- Sets the icon for this Preference with a Drawable.</summary>
         <value>the icon</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -1150,7 +1166,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/Preference#setIcon(int)" title="Reference documentation">Java documentation for <code>android.preference.Preference.setIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/Preference#setIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.preference.Preference.setIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1959,7 +1975,6 @@
         <ReturnType>Android.Preferences.Preference+IOnPreferenceChangeListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="onPreferenceChangeListener">The callback to be invoked.</param>
         <summary>Returns the callback to be invoked when this Preference is changed by the
             user (but before the internal state has been updated). -or- Sets the callback to be invoked when this Preference is changed by the
             user (but before the internal state has been updated).</summary>
@@ -2014,7 +2029,6 @@
         <ReturnType>Android.Preferences.Preference+IOnPreferenceClickListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="onPreferenceClickListener">The callback to be invoked.</param>
         <summary>Returns the callback to be invoked when this Preference is clicked. -or- Sets the callback to be invoked when this Preference is clicked.</summary>
         <value>The callback to be invoked.</value>
         <remarks>
@@ -3559,8 +3573,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="summaryResId">the summary as a resource</param>
-        <summary>Returns the summary of this Preference. -or- Sets the summary for this Preference with a resource ID.</summary>
+        <param name="summary">the summary for the preference</param>
+        <summary>Returns the summary of this Preference. -or- Sets the summary for this Preference with a CharSequence.</summary>
         <value>the summary</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -3572,7 +3586,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/Preference#setSummary(int)" title="Reference documentation">Java documentation for <code>android.preference.Preference.setSummary(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/Preference#setSummary(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.Preference.setSummary(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -3696,8 +3710,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="titleResId">the title as a resource ID</param>
-        <summary>Returns the title of this Preference. -or- Sets the title for this Preference with a resource ID.</summary>
+        <param name="title">the title for this Preference</param>
+        <summary>Returns the title of this Preference. -or- Sets the title for this Preference with a CharSequence.</summary>
         <value>the title</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -3709,7 +3723,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/Preference#setTitle(int)" title="Reference documentation">Java documentation for <code>android.preference.Preference.setTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/Preference#setTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.Preference.setTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/PreferenceActivity.xml b/docs/Mono.Android/en/Android.Preferences/PreferenceActivity.xml
index c38c337d24..09a5f7e682 100644
--- a/docs/Mono.Android/en/Android.Preferences/PreferenceActivity.xml
+++ b/docs/Mono.Android/en/Android.Preferences/PreferenceActivity.xml
@@ -1406,9 +1406,9 @@
         <Parameter Name="listener" Type="Android.Views.View+IOnClickListener" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
         <param name="title">the title for the breadcrumb</param>
         <param name="shortTitle">the short title for the breadcrumb</param>
+        <param name="listener">To be added.</param>
         <summary>Should be called after onCreate to ensure that the breadcrumbs, if any, were created.</summary>
         <remarks>
           <para>
@@ -1450,9 +1450,9 @@
         <Parameter Name="listener" Type="Android.Views.View+IOnClickListener" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
         <param name="title">the title for the breadcrumb</param>
         <param name="shortTitle">the short title for the breadcrumb</param>
+        <param name="listener">To be added.</param>
         <summary>Should be called after onCreate to ensure that the breadcrumbs, if any, were created.</summary>
         <remarks>
           <para>
@@ -1801,20 +1801,19 @@
         <param name="fragmentName">The name of the fragment to display.</param>
         <param name="args">Optional arguments to supply to the fragment.</param>
         <param name="resultTo">Option fragment that should receive the result of
- the activity launch.</param>
+            the activity launch.</param>
         <param name="resultRequestCode">If resultTo is non-null, this is the request
- code in which to report the result.</param>
+            code in which to report the result.</param>
         <param name="titleRes">Resource ID of string to display for the title of
- this set of preferences.</param>
+            this set of preferences.</param>
         <param name="shortTitleRes">Resource ID of string to display for the short title of
- this set of preferences.
-</param>
-        <summary>Like <c>#startWithFragment(String, Bundle, Fragment, int, int, int)</c>
-            but uses a 0 titleRes.</summary>
+            this set of preferences.</param>
+        <summary>Start a new instance of this activity, showing only the given
+            preference fragment.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/PreferenceActivity#startWithFragment(java.lang.String,%20android.os.Bundle,%20android.app.Fragment,%20int)" title="Reference documentation">Java documentation for <code>android.preference.PreferenceActivity.startWithFragment(java.lang.String, android.os.Bundle, android.app.Fragment, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/PreferenceActivity#startWithFragment(java.lang.String,%20android.os.Bundle,%20android.app.Fragment,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.preference.PreferenceActivity.startWithFragment(java.lang.String, android.os.Bundle, android.app.Fragment, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1900,15 +1899,13 @@
       </Parameters>
       <Docs>
         <param name="fragmentName">The name of the fragment to display.</param>
-        <param name="args">Optional arguments to supply to the fragment.
-</param>
-        <param name="header">The new header to display.</param>
-        <summary>When in two-pane mode, switch to the fragment pane to show the given
+        <param name="args">Optional arguments to supply to the fragment.</param>
+        <summary>When in two-pane mode, switch the fragment pane to show the given
             preference fragment.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/PreferenceActivity#switchToHeader(android.preference.Header)" title="Reference documentation">Java documentation for <code>android.preference.PreferenceActivity.switchToHeader(android.preference.Header)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/PreferenceActivity#switchToHeader(java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.preference.PreferenceActivity.switchToHeader(java.lang.String, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/PreferenceManager.xml b/docs/Mono.Android/en/Android.Preferences/PreferenceManager.xml
index 910c8408f5..1c2571dc5a 100644
--- a/docs/Mono.Android/en/Android.Preferences/PreferenceManager.xml
+++ b/docs/Mono.Android/en/Android.Preferences/PreferenceManager.xml
@@ -614,13 +614,13 @@
         <Parameter Name="readAgain" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="context">The context of the shared preferences.</param>
         <param name="sharedPreferencesName">A custom name for the shared preferences file.</param>
         <param name="sharedPreferencesMode">The file creation mode for the shared preferences file, such
- as <see cref="F:Android.Content.FileCreationMode.Private" tool="ReplaceLinkValue" /> or <see cref="F:Android.Content.FileCreationMode.Private" tool="ReplaceLinkValue" /></param>
-        <param name="context">The context of the shared preferences.</param>
+            as <c>android.content.Context#MODE_PRIVATE</c> or <c>android.content.Context#MODE_PRIVATE</c></param>
         <param name="resId">The resource ID of the preference XML file.</param>
         <param name="readAgain">Whether to re-read the default values.
-            If false, this method sets the default values only if this
+            If false, this method will set the default values only if this
             method has never been called in the past (or if the
             <c>#KEY_HAS_SET_DEFAULT_VALUES</c> in the default value shared
             preferences file is false). To attempt to set the default values again
@@ -631,12 +631,13 @@
                        <c>PreferenceManager#getDefaultSharedPreferences(Context)</c>
                        and clear it followed by a call to this method with this
                        parameter set to true.</param>
-        <summary>Sets the default values from an XML preference file by reading the values defined
-            by each <c>Preference</c> item's <c>android:defaultValue</c> attribute.</summary>
+        <summary>Similar to <c>#setDefaultValues(Context, int, boolean)</c> but allows
+            the client to provide the filename and mode of the shared preferences
+            file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/PreferenceManager#setDefaultValues(android.content.Context,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.preference.PreferenceManager.setDefaultValues(android.content.Context, int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/PreferenceManager#setDefaultValues(android.content.Context,%20java.lang.String,%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.preference.PreferenceManager.setDefaultValues(android.content.Context, java.lang.String, int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/SwitchPreference.xml b/docs/Mono.Android/en/Android.Preferences/SwitchPreference.xml
index c7d085b514..ce039ebb2f 100644
--- a/docs/Mono.Android/en/Android.Preferences/SwitchPreference.xml
+++ b/docs/Mono.Android/en/Android.Preferences/SwitchPreference.xml
@@ -104,13 +104,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The Context that will style this preference</param>
-        <summary>Construct a new SwitchPreference with default style options.</summary>
+        <param name="attrs">Style attributes that differ from the default</param>
+        <summary>Construct a new SwitchPreference with the given style options.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#SwitchPreference(android.content.Context)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.SwitchPreference(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#SwitchPreference(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.SwitchPreference(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -171,14 +171,16 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The Context that will style this preference</param>
-        <summary>Construct a new SwitchPreference with default style options.</summary>
+        <param name="attrs">Style attributes that differ from the default</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <summary>Construct a new SwitchPreference with the given style options.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#SwitchPreference(android.content.Context)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.SwitchPreference(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#SwitchPreference(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.SwitchPreference(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -217,15 +219,20 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
         <param name="context">The Context that will style this preference</param>
-        <summary>Construct a new SwitchPreference with default style options.</summary>
+        <param name="attrs">Style attributes that differ from the default</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                   supplies default values for the view, used only if
+                   defStyleAttr is 0 or can not be found in the theme. Can be 0
+                   to not look for defaults.</param>
+        <summary>Construct a new SwitchPreference with the given style options.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#SwitchPreference(android.content.Context)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.SwitchPreference(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#SwitchPreference(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.SwitchPreference(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -404,7 +411,7 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">The text as a string resource ID</param>
+        <param name="offText">Text to display in the off state</param>
         <summary>Set the text displayed on the switch widget in the off state.</summary>
         <value>The text that will be displayed on the switch widget in the off state</value>
         <remarks>
@@ -417,7 +424,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#setSwitchTextOff(int)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.setSwitchTextOff(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#setSwitchTextOff(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.setSwitchTextOff(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -478,7 +485,7 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">The text as a string resource ID</param>
+        <param name="onText">Text to display in the on state</param>
         <summary>Set the text displayed on the switch widget in the on state.</summary>
         <value>The text that will be displayed on the switch widget in the on state</value>
         <remarks>
@@ -491,7 +498,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#setSwitchTextOn(int)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.setSwitchTextOn(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/SwitchPreference#setSwitchTextOn(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.SwitchPreference.setSwitchTextOn(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Preferences/TwoStatePreference.xml b/docs/Mono.Android/en/Android.Preferences/TwoStatePreference.xml
index c0af410898..2f1547d043 100644
--- a/docs/Mono.Android/en/Android.Preferences/TwoStatePreference.xml
+++ b/docs/Mono.Android/en/Android.Preferences/TwoStatePreference.xml
@@ -487,8 +487,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="summaryResId">The summary as a resource.</param>
-        <summary>Returns the summary to be shown when unchecked.</summary>
+        <param name="summary">The summary to be shown when unchecked.</param>
+        <summary>Returns the summary to be shown when unchecked. -or- Sets the summary to be shown when unchecked.</summary>
         <value>The summary.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -500,7 +500,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/TwoStatePreference#setSummaryOff(int)" title="Reference documentation">Java documentation for <code>android.preference.TwoStatePreference.setSummaryOff(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/TwoStatePreference#setSummaryOff(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.TwoStatePreference.setSummaryOff(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -561,8 +561,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="summaryResId">The summary as a resource.</param>
-        <summary>Returns the summary to be shown when checked.</summary>
+        <param name="summary">The summary to be shown when checked.</param>
+        <summary>Returns the summary to be shown when checked. -or- Sets the summary to be shown when checked.</summary>
         <value>The summary.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -574,7 +574,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/preference/TwoStatePreference#setSummaryOn(int)" title="Reference documentation">Java documentation for <code>android.preference.TwoStatePreference.setSummaryOn(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/preference/TwoStatePreference#setSummaryOn(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.preference.TwoStatePreference.setSummaryOn(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.PrintServices/PrintJob.xml b/docs/Mono.Android/en/Android.PrintServices/PrintJob.xml
index f8418a994a..a84efb7536 100644
--- a/docs/Mono.Android/en/Android.PrintServices/PrintJob.xml
+++ b/docs/Mono.Android/en/Android.PrintServices/PrintJob.xml
@@ -744,13 +744,12 @@
         <Parameter Name="status" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="status">To be added.</param>
-        <param name="statusResId">The new status as a String resource. If 0 the status will be empty.</param>
-        <summary>Sets the status of this print job as a string resource.</summary>
+        <param name="status">The new status. If null the status will be empty.</param>
+        <summary>Sets the status of this print job.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/printservice/PrintJob#setStatus(int)" title="Reference documentation">Java documentation for <code>android.printservice.PrintJob.setStatus(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/printservice/PrintJob#setStatus(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.printservice.PrintJob.setStatus(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -817,13 +816,12 @@
         <Parameter Name="status" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="status">To be added.</param>
-        <param name="statusResId">The new status as a String resource. If 0 the status will be empty.</param>
-        <summary>Sets the status of this print job as a string resource.</summary>
+        <param name="status">The new status. If null the status will be empty.</param>
+        <summary>Sets the status of this print job.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/printservice/PrintJob#setStatus(int)" title="Reference documentation">Java documentation for <code>android.printservice.PrintJob.setStatus(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/printservice/PrintJob#setStatus(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.printservice.PrintJob.setStatus(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Provider/DocumentsProvider.xml b/docs/Mono.Android/en/Android.Provider/DocumentsProvider.xml
index 71d90487dc..89c486ed86 100644
--- a/docs/Mono.Android/en/Android.Provider/DocumentsProvider.xml
+++ b/docs/Mono.Android/en/Android.Provider/DocumentsProvider.xml
@@ -802,7 +802,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#openAssetFile(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.openAssetFile(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#openAssetFile(android.net.Uri,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -998,7 +998,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#openFile(android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.openFile(android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#openFile(android.net.Uri,%20java.lang.String,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.openFile(android.net.Uri, java.lang.String, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1105,7 +1105,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#openTypedAssetFile(android.net.Uri,%20java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#openTypedAssetFile(android.net.Uri,%20java.lang.String,%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1352,29 +1352,22 @@
         <Parameter Name="sortOrder" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sortOrder">how to order the rows, formatted as an SQL
-            <c>ORDER BY</c> clause (excluding the ORDER BY itself).
-            Passing <c>null</c> will use the default sort order, which
-            may be unordered. This ordering is a hint that can be used to
-            prioritize how data is fetched from the network, but UI may
-            always enforce a specific ordering.</param>
         <param name="parentDocumentId">the directory to return children for.</param>
         <param name="projection">list of <c>Document</c> columns to put into the
                        cursor. If <c>null</c> all supported columns should be
                        included.</param>
-        <param name="queryArgs">Bundle containing sorting information or other
-                       argument useful to the provider. If no sorting
-                       information is available, default sorting
-                       will be used, which may be unordered. See
-                       <c>ContentResolver#QUERY_ARG_SORT_COLUMNS</c> for
-                       details.</param>
-        <summary>Override this method to return the children documents contained
-            in the requested directory.</summary>
+        <param name="sortOrder">how to order the rows, formatted as an SQL
+                       <c>ORDER BY</c> clause (excluding the ORDER BY itself).
+                       Passing <c>null</c> will use the default sort order, which
+                       may be unordered. This ordering is a hint that can be used to
+                       prioritize how data is fetched from the network, but UI may
+                       always enforce a specific ordering.</param>
+        <summary>Return the children documents contained in the requested directory.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#queryChildDocuments(java.lang.String,%20java.lang.String[],%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.queryChildDocuments(java.lang.String, java.lang.String[], android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#queryChildDocuments(java.lang.String,%20java.lang.String[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.queryChildDocuments(java.lang.String, java.lang.String[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1507,17 +1500,18 @@
       </Parameters>
       <Docs>
         <param name="rootId">To be added.</param>
-        <param name="queryArgs">To be added.</param>
-        <param name="signal">To be added.</param>
         <param name="projection">list of <c>Document</c> columns to put into the
                        cursor. If <c>null</c> all supported columns should be
                        included.</param>
+        <param name="queryArgs">the extra query arguments.</param>
+        <param name="signal">used by the caller to signal if the request should be
+                       cancelled. May be null.</param>
         <summary>Return recently modified documents under the requested root.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#queryRecentDocuments(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.queryRecentDocuments(java.lang.String, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#queryRecentDocuments(java.lang.String,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.queryRecentDocuments(java.lang.String, java.lang.String[], android.os.Bundle, android.os.CancellationSignal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1646,19 +1640,26 @@
         <Parameter Name="queryArgs" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="queryArgs">To be added.</param>
         <param name="rootId">the root to search under.</param>
-        <param name="query">string to match documents against.</param>
         <param name="projection">list of <c>Document</c> columns to put into the
                        cursor. If <c>null</c> all supported columns should be
                        included.</param>
+        <param name="queryArgs">the query arguments.
+                       <c>DocumentsContract#QUERY_ARG_EXCLUDE_MEDIA</c>,
+                       <c>DocumentsContract#QUERY_ARG_DISPLAY_NAME</c>,
+                       <c>DocumentsContract#QUERY_ARG_MIME_TYPES</c>,
+                       <c>DocumentsContract#QUERY_ARG_FILE_SIZE_OVER</c>,
+                       <c>DocumentsContract#QUERY_ARG_LAST_MODIFIED_AFTER</c>.</param>
         <summary>Return documents that match the given query under the requested
             root.</summary>
-        <returns>To be added.</returns>
+        <returns>cursor containing search result. Include
+                    <c>ContentResolver#EXTRA_HONORED_ARGS</c> in <c>Cursor</c>
+                    extras <c>Bundle</c> when any QUERY_ARG_* value was honored
+                    during the preparation of the results.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#querySearchDocuments(java.lang.String,%20java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.querySearchDocuments(java.lang.String, java.lang.String, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/provider/DocumentsProvider#querySearchDocuments(java.lang.String,%20java.lang.String[],%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.provider.DocumentsProvider.querySearchDocuments(java.lang.String, java.lang.String[], android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Provider/FontRequest.xml b/docs/Mono.Android/en/Android.Provider/FontRequest.xml
index a188bf04e2..f92da427df 100644
--- a/docs/Mono.Android/en/Android.Provider/FontRequest.xml
+++ b/docs/Mono.Android/en/Android.Provider/FontRequest.xml
@@ -111,18 +111,20 @@
         <Parameter Name="certificates" Type="System.Collections.Generic.IList&lt;System.Collections.Generic.IList&lt;System.Byte[]&gt;&gt;" />
       </Parameters>
       <Docs>
-        <param name="certificates">To be added.</param>
-        <param name="providerAuthority">The authority of the Font Provider to be used for the request. This
-                    should be a system installed app.</param>
-        <param name="providerPackage">The package for the Font Provider to be used for the request. This is
-                    used to verify the identity of the provider.</param>
+        <param name="providerAuthority">The authority of the Font Provider to be used for the request.</param>
         <param name="query">The query to be sent over to the provider. Refer to your font provider's
                     documentation on the format of this string.</param>
+        <param name="providerPackage">The package for the Font Provider to be used for the request. This is
+                    used to verify the identity of the provider.</param>
+        <param name="certificates">The list of sets of hashes for the certificates the provider should be
+                    signed with. This is used to verify the identity of the provider. Each set in the
+                    list represents one collection of signature hashes. Refer to your font provider's
+                    documentation for these values.</param>
         <summary>To be added.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/provider/FontRequest#FontRequest(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.provider.FontRequest.FontRequest(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/provider/FontRequest#FontRequest(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.util.List)" title="Reference documentation">Java documentation for <code>android.provider.FontRequest.FontRequest(java.lang.String, java.lang.String, java.lang.String, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/Allocation.xml b/docs/Mono.Android/en/Android.Renderscripts/Allocation.xml
index 59a1495c16..f379ef86fe 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/Allocation.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/Allocation.xml
@@ -192,18 +192,14 @@
         <Parameter Name="array" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="array">The source data array.
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="data">the source data allocation.</param>
-        <param name="dataOff">off The offset of the first element in data to
-                     be copied.</param>
-        <summary>Copy part of an Allocation into this Allocation.</summary>
+        <param name="array">The source array.</param>
+        <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20android.renderscript.Allocation,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, android.renderscript.Allocation, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -243,18 +239,14 @@
         <Parameter Name="d" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="data">the source data allocation.</param>
-        <param name="dataOff">off The offset of the first element in data to
-                     be copied.</param>
-        <summary>Copy part of an Allocation into this Allocation.</summary>
+        <param name="d">the source array</param>
+        <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20android.renderscript.Allocation,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, android.renderscript.Allocation, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -295,18 +287,14 @@
         <Parameter Name="d" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="data">the source data allocation.</param>
-        <param name="dataOff">off The offset of the first element in data to
-                     be copied.</param>
-        <summary>Copy part of an Allocation into this Allocation.</summary>
+        <param name="d">the source array</param>
+        <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20android.renderscript.Allocation,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, android.renderscript.Allocation, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -347,18 +335,14 @@
         <Parameter Name="d" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="data">the source data allocation.</param>
-        <param name="dataOff">off The offset of the first element in data to
-                     be copied.</param>
-        <summary>Copy part of an Allocation into this Allocation.</summary>
+        <param name="d">the source array</param>
+        <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20android.renderscript.Allocation,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, android.renderscript.Allocation, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -399,18 +383,14 @@
         <Parameter Name="d" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array.
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="data">the source data allocation.</param>
-        <param name="dataOff">off The offset of the first element in data to
-                     be copied.</param>
-        <summary>Copy part of an Allocation into this Allocation.</summary>
+        <param name="d">the source array.</param>
+        <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20android.renderscript.Allocation,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, android.renderscript.Allocation, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFrom(int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFrom(int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -549,16 +529,14 @@
         <Parameter Name="d" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -599,16 +577,14 @@
         <Parameter Name="d" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -649,16 +625,14 @@
         <Parameter Name="d" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -699,16 +673,14 @@
         <Parameter Name="d" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy an array into a 1D region of this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeFromUnchecked(int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeFromUnchecked(int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -796,15 +768,14 @@
         <Parameter Name="d" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array.</param>
+        <param name="d">the source array</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -844,15 +815,14 @@
         <Parameter Name="d" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array.</param>
+        <param name="d">the source array</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -892,15 +862,14 @@
         <Parameter Name="d" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array.</param>
+        <param name="d">the source array</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -940,15 +909,14 @@
         <Parameter Name="d" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The source array.</param>
+        <param name="d">the source array.</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeTo(int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeTo(int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1035,15 +1003,14 @@
         <Parameter Name="d" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The dest array</param>
+        <param name="d">the source array</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1083,15 +1050,14 @@
         <Parameter Name="d" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The dest array</param>
+        <param name="d">the source array</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1131,15 +1097,14 @@
         <Parameter Name="d" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The dest array</param>
+        <param name="d">the source array</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1179,15 +1144,14 @@
         <Parameter Name="d" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
         <param name="off">The offset of the first element to be copied.</param>
         <param name="count">The number of elements to be copied.</param>
-        <param name="array">The dest array</param>
+        <param name="d">the source array</param>
         <summary>Copy a 1D region of this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy1DRangeToUnchecked(int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy1DRangeToUnchecked(int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1227,19 +1191,14 @@
         <Parameter Name="data" Type="Android.Graphics.Bitmap" />
       </Parameters>
       <Docs>
-        <param name="xoff">X offset of the region in this Allocation</param>
-        <param name="yoff">Y offset of the region in this Allocation</param>
-        <param name="w">Width of the region to update.</param>
-        <param name="h">Height of the region to update.</param>
-        <param name="data">source Allocation.</param>
-        <param name="dataXoff">X offset in source Allocation</param>
-        <param name="dataYoff">Y offset in source Allocation</param>
-        <summary>Copy a rectangular region from an Allocation into a rectangular region in
-            this Allocation.</summary>
+        <param name="xoff">X offset of the region to update in this Allocation</param>
+        <param name="yoff">Y offset of the region to update in this Allocation</param>
+        <param name="data">the Bitmap to be copied</param>
+        <summary>Copy a <c>android.graphics.Bitmap</c> into an Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20android.renderscript.Allocation,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, android.graphics.Bitmap)</code>.</a>
             </format>
           </para>
           <para>
@@ -1282,21 +1241,16 @@
         <Parameter Name="array" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="array">Data to be placed into the Allocation
-</param>
-        <param name="xoff">X offset of the region in this Allocation</param>
-        <param name="yoff">Y offset of the region in this Allocation</param>
-        <param name="w">Width of the region to update.</param>
-        <param name="h">Height of the region to update.</param>
-        <param name="data">source Allocation.</param>
-        <param name="dataXoff">X offset in source Allocation</param>
-        <param name="dataYoff">Y offset in source Allocation</param>
-        <summary>Copy a rectangular region from an Allocation into a rectangular region in
-            this Allocation.</summary>
+        <param name="xoff">X offset of the region to update in this Allocation</param>
+        <param name="yoff">Y offset of the region to update in this Allocation</param>
+        <param name="w">Width of the region to update</param>
+        <param name="h">Height of the region to update</param>
+        <param name="array">Data to be placed into the Allocation</param>
+        <summary>Copy from an array into a rectangular region in this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20android.renderscript.Allocation,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1338,19 +1292,16 @@
         <Parameter Name="data" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="xoff">X offset of the region in this Allocation</param>
-        <param name="yoff">Y offset of the region in this Allocation</param>
-        <param name="w">Width of the region to update.</param>
-        <param name="h">Height of the region to update.</param>
-        <param name="data">source Allocation.</param>
-        <param name="dataXoff">X offset in source Allocation</param>
-        <param name="dataYoff">Y offset in source Allocation</param>
-        <summary>Copy a rectangular region from an Allocation into a rectangular region in
-            this Allocation.</summary>
+        <param name="xoff">X offset of the region to update in this Allocation</param>
+        <param name="yoff">Y offset of the region to update in this Allocation</param>
+        <param name="w">Width of the region to update</param>
+        <param name="h">Height of the region to update</param>
+        <param name="data">to be placed into the Allocation</param>
+        <summary>Copy from an array into a rectangular region in this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20android.renderscript.Allocation,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1393,19 +1344,16 @@
         <Parameter Name="data" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="xoff">X offset of the region in this Allocation</param>
-        <param name="yoff">Y offset of the region in this Allocation</param>
-        <param name="w">Width of the region to update.</param>
-        <param name="h">Height of the region to update.</param>
-        <param name="data">source Allocation.</param>
-        <param name="dataXoff">X offset in source Allocation</param>
-        <param name="dataYoff">Y offset in source Allocation</param>
-        <summary>Copy a rectangular region from an Allocation into a rectangular region in
-            this Allocation.</summary>
+        <param name="xoff">X offset of the region to update in this Allocation</param>
+        <param name="yoff">Y offset of the region to update in this Allocation</param>
+        <param name="w">Width of the region to update</param>
+        <param name="h">Height of the region to update</param>
+        <param name="data">to be placed into the Allocation</param>
+        <summary>Copy from an array into a rectangular region in this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20android.renderscript.Allocation,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1448,19 +1396,16 @@
         <Parameter Name="data" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="xoff">X offset of the region in this Allocation</param>
-        <param name="yoff">Y offset of the region in this Allocation</param>
-        <param name="w">Width of the region to update.</param>
-        <param name="h">Height of the region to update.</param>
-        <param name="data">source Allocation.</param>
-        <param name="dataXoff">X offset in source Allocation</param>
-        <param name="dataYoff">Y offset in source Allocation</param>
-        <summary>Copy a rectangular region from an Allocation into a rectangular region in
-            this Allocation.</summary>
+        <param name="xoff">X offset of the region to update in this Allocation</param>
+        <param name="yoff">Y offset of the region to update in this Allocation</param>
+        <param name="w">Width of the region to update</param>
+        <param name="h">Height of the region to update</param>
+        <param name="data">to be placed into the Allocation</param>
+        <summary>Copy from an array into a rectangular region in this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20android.renderscript.Allocation,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1503,19 +1448,16 @@
         <Parameter Name="data" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="xoff">X offset of the region in this Allocation</param>
-        <param name="yoff">Y offset of the region in this Allocation</param>
-        <param name="w">Width of the region to update.</param>
-        <param name="h">Height of the region to update.</param>
-        <param name="data">source Allocation.</param>
-        <param name="dataXoff">X offset in source Allocation</param>
-        <param name="dataYoff">Y offset in source Allocation</param>
-        <summary>Copy a rectangular region from an Allocation into a rectangular region in
-            this Allocation.</summary>
+        <param name="xoff">X offset of the region to update in this Allocation</param>
+        <param name="yoff">Y offset of the region to update in this Allocation</param>
+        <param name="w">Width of the region to update</param>
+        <param name="h">Height of the region to update</param>
+        <param name="data">to be placed into the Allocation</param>
+        <summary>Copy from an array into a rectangular region in this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20android.renderscript.Allocation,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeFrom(int,%20int,%20int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeFrom(int, int, int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1666,17 +1608,16 @@
         <Parameter Name="data" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
         <param name="xoff">X offset of the region to copy in this Allocation</param>
         <param name="yoff">Y offset of the region to copy in this Allocation</param>
         <param name="w">Width of the region to copy</param>
         <param name="h">Height of the region to copy</param>
-        <param name="array">Dest Array to be copied into</param>
+        <param name="data">Dest Array to be copied into</param>
         <summary>Copy from a rectangular region in this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1718,17 +1659,16 @@
         <Parameter Name="data" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
         <param name="xoff">X offset of the region to copy in this Allocation</param>
         <param name="yoff">Y offset of the region to copy in this Allocation</param>
         <param name="w">Width of the region to copy</param>
         <param name="h">Height of the region to copy</param>
-        <param name="array">Dest Array to be copied into</param>
+        <param name="data">Dest Array to be copied into</param>
         <summary>Copy from a rectangular region in this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1770,17 +1710,16 @@
         <Parameter Name="data" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
         <param name="xoff">X offset of the region to copy in this Allocation</param>
         <param name="yoff">Y offset of the region to copy in this Allocation</param>
         <param name="w">Width of the region to copy</param>
         <param name="h">Height of the region to copy</param>
-        <param name="array">Dest Array to be copied into</param>
+        <param name="data">Dest Array to be copied into</param>
         <summary>Copy from a rectangular region in this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1822,17 +1761,16 @@
         <Parameter Name="data" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
         <param name="xoff">X offset of the region to copy in this Allocation</param>
         <param name="yoff">Y offset of the region to copy in this Allocation</param>
         <param name="w">Width of the region to copy</param>
         <param name="h">Height of the region to copy</param>
-        <param name="array">Dest Array to be copied into</param>
+        <param name="data">Dest Array to be copied into</param>
         <summary>Copy from a rectangular region in this Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy2DRangeTo(int,%20int,%20int,%20int,%20float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy2DRangeTo(int, int, int, int, float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1876,23 +1814,18 @@
         <Parameter Name="array" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
         <param name="xoff">X offset of the region to update in this Allocation</param>
         <param name="yoff">Y offset of the region to update in this Allocation</param>
         <param name="zoff">Z offset of the region to update in this Allocation</param>
-        <param name="w">Width of the region to update.</param>
-        <param name="h">Height of the region to update.</param>
-        <param name="d">Depth of the region to update.</param>
-        <param name="data">source allocation.</param>
-        <param name="dataXoff">X offset of the region in the source Allocation</param>
-        <param name="dataYoff">Y offset of the region in the source Allocation</param>
-        <param name="dataZoff">Z offset of the region in the source Allocation</param>
-        <summary>Copy a rectangular region into the allocation from another
-            allocation.</summary>
+        <param name="w">Width of the region to update</param>
+        <param name="h">Height of the region to update</param>
+        <param name="d">Depth of the region to update</param>
+        <param name="array">to be placed into the allocation</param>
+        <summary>Copy from an array into a 3D region in this Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy3DRangeFrom(int,%20int,%20int,%20int,%20int,%20int,%20android.renderscript.Allocation,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy3DRangeFrom(int, int, int, int, int, int, android.renderscript.Allocation, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copy3DRangeFrom(int,%20int,%20int,%20int,%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copy3DRangeFrom(int, int, int, int, int, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -2082,14 +2015,12 @@
         <Parameter Name="a" Type="Android.Renderscripts.Allocation" />
       </Parameters>
       <Docs>
-        <param name="a">the source allocation
-</param>
-        <param name="b">the source bitmap</param>
-        <summary>Copy into an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="a">the source allocation</param>
+        <summary>Copy an Allocation from an Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.renderscript.Allocation)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.renderscript.Allocation)</code>.</a>
             </format>
           </para>
           <para>
@@ -2128,14 +2059,12 @@
         <Parameter Name="d" Type="Android.Renderscripts.BaseObj[]" />
       </Parameters>
       <Docs>
-        <param name="d">Source array.
-</param>
-        <param name="b">the source bitmap</param>
-        <summary>Copy into an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">Source array.</param>
+        <summary>Copy an array of RS objects to the Allocation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.renderscript.BaseObj[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.renderscript.BaseObj[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2174,14 +2103,12 @@
         <Parameter Name="array" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="array">The source data array
-</param>
-        <param name="b">the source bitmap</param>
-        <summary>Copy into an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="array">The source array</param>
+        <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -2219,14 +2146,12 @@
         <Parameter Name="d" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="b">the source bitmap</param>
-        <summary>Copy into an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">the source array</param>
+        <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2265,14 +2190,12 @@
         <Parameter Name="d" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="b">the source bitmap</param>
-        <summary>Copy into an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">the source array</param>
+        <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2311,14 +2234,12 @@
         <Parameter Name="d" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="b">the source bitmap</param>
-        <summary>Copy into an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">the source array</param>
+        <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2357,14 +2278,12 @@
         <Parameter Name="d" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="b">the source bitmap</param>
-        <summary>Copy into an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">the source array</param>
+        <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFrom(float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFrom(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2446,14 +2365,12 @@
         <Parameter Name="d" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2492,14 +2409,12 @@
         <Parameter Name="d" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2538,14 +2453,12 @@
         <Parameter Name="d" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2584,14 +2497,12 @@
         <Parameter Name="d" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="d">the source data array
-</param>
-        <param name="array">The source array</param>
+        <param name="d">the source array</param>
         <summary>Copy into this Allocation from an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyFromUnchecked(float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyFromUnchecked(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2674,14 +2585,12 @@
         <Parameter Name="array" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="array">The array to be set from the Allocation.
-</param>
-        <param name="b">The bitmap to be set from the Allocation.</param>
-        <summary>Copy from the Allocation into a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="array">The array to be set from the Allocation.</param>
+        <summary>Copy from the Allocation into an array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -2719,14 +2628,12 @@
         <Parameter Name="d" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="d">The array to be set from the Allocation.
-</param>
-        <param name="b">The bitmap to be set from the Allocation.</param>
-        <summary>Copy from the Allocation into a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">The array to be set from the Allocation.</param>
+        <summary>Copy from the Allocation into a byte array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(byte[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2765,14 +2672,12 @@
         <Parameter Name="d" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="d">The array to be set from the Allocation.
-</param>
-        <param name="b">The bitmap to be set from the Allocation.</param>
-        <summary>Copy from the Allocation into a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">The array to be set from the Allocation.</param>
+        <summary>Copy from the Allocation into a short array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(short[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2811,14 +2716,12 @@
         <Parameter Name="d" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="d">The array to be set from the Allocation.
-</param>
-        <param name="b">The bitmap to be set from the Allocation.</param>
-        <summary>Copy from the Allocation into a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">The array to be set from the Allocation.</param>
+        <summary>Copy from the Allocation into a int array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2857,14 +2760,12 @@
         <Parameter Name="d" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="d">The array to be set from the Allocation.
-</param>
-        <param name="b">The bitmap to be set from the Allocation.</param>
-        <summary>Copy from the Allocation into a <c>android.graphics.Bitmap</c>.</summary>
+        <param name="d">The array to be set from the Allocation.</param>
+        <summary>Copy from the Allocation into a float array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#copyTo(float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.copyTo(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3014,11 +2915,11 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mips">specifies desired mipmap behaviour for the cubemap</param>
-        <param name="usage">bit field specifying how the cubemap is utilized</param>
         <param name="rs">Context to which the allocation will belong.</param>
         <param name="b">bitmap with cubemap faces layed out in the following
                      format: right, left, top, bottom, front, back</param>
+        <param name="mips">specifies desired mipmap behaviour for the cubemap</param>
+        <param name="usage">bit field specifying how the cubemap is utilized</param>
         <summary>Creates a non-mipmapped cubemap Allocation for use as a graphics texture
             from a <c>android.graphics.Bitmap</c> containing the horizontal list of
             cube faces.</summary>
@@ -3139,8 +3040,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mips">specifies desired mipmap behaviour for the cubemap</param>
-        <param name="usage">bit field specifying how the cubemap is utilized</param>
         <param name="rs">Context to which the allocation will belong.</param>
         <param name="xpos">cubemap face in the positive x direction</param>
         <param name="xneg">cubemap face in the negative x direction</param>
@@ -3148,6 +3047,8 @@
         <param name="yneg">cubemap face in the negative y direction</param>
         <param name="zpos">cubemap face in the positive z direction</param>
         <param name="zneg">cubemap face in the negative z direction</param>
+        <param name="mips">specifies desired mipmap behaviour for the cubemap</param>
+        <param name="usage">bit field specifying how the cubemap is utilized</param>
         <summary>Creates a non-mipmapped cubemap Allocation for use as a sampler input
             from 6 <c>android.graphics.Bitmap</c> objects containing the cube
             faces.</summary>
@@ -3251,12 +3152,12 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="rs">Context to which the allocation will belong.</param>
+        <param name="b">bitmap source for the allocation data</param>
         <param name="mips">specifies desired mipmap behaviour for the
              allocation</param>
         <param name="usage">bit field specifying how the allocation is
               utilized</param>
-        <param name="rs">Context to which the allocation will belong.</param>
-        <param name="b">bitmap source for the allocation data</param>
         <summary>Creates an Allocation from a <c>android.graphics.Bitmap</c>.</summary>
         <returns>Allocation containing bitmap data</returns>
         <remarks>
@@ -3362,13 +3263,13 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="rs">Context to which the allocation will belong.</param>
+        <param name="res">application resources</param>
+        <param name="id">resource id to load the data from</param>
         <param name="mips">specifies desired mipmap behaviour for the
              allocation</param>
         <param name="usage">bit field specifying how the allocation is
               utilized</param>
-        <param name="rs">Context to which the allocation will belong.</param>
-        <param name="res">application resources</param>
-        <param name="id">resource id to load the data from</param>
         <summary>Creates a non-mipmapped Allocation to use as a graphics texture from the
             <c>android.graphics.Bitmap</c> referenced by resource ID.</summary>
         <returns>Allocation containing resource data</returns>
@@ -3530,17 +3431,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="usage">bit field specifying how the Allocation is
-              utilized</param>
         <param name="rs">Context to which the Allocation will belong.</param>
         <param name="e">Element to use in the Allocation</param>
         <param name="count">the number of Elements in the Allocation</param>
+        <param name="usage">bit field specifying how the Allocation is
+                         utilized</param>
         <summary>Creates an Allocation with a specified number of given elements</summary>
         <returns>allocation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#createSized(android.renderscript.RenderScript,%20android.renderscript.Element,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.createSized(android.renderscript.RenderScript, android.renderscript.Element, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#createSized(android.renderscript.RenderScript,%20android.renderscript.Element,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3635,16 +3536,17 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="rs">Context to which the allocation will belong.</param>
+        <param name="type">renderscript type describing data layout</param>
         <param name="usage">bit field specifying how the allocation is
-              utilized</param>
-        <param name="rs">Context to which the Allocation will belong.</param>
-        <param name="type">RenderScript Type describing data layout</param>
-        <summary>Creates an Allocation for use by scripts with a given <c>android.renderscript.Type</c> and no mipmaps</summary>
+                         utilized</param>
+        <summary>Creates an Allocation with the size specified by the type and no mipmaps
+            generated by default</summary>
         <returns>allocation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Allocation#createTyped(android.renderscript.RenderScript,%20android.renderscript.Type)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.createTyped(android.renderscript.RenderScript, android.renderscript.Type)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#createTyped(android.renderscript.RenderScript,%20android.renderscript.Type,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.createTyped(android.renderscript.RenderScript, android.renderscript.Type, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3693,13 +3595,13 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="rs">Context to which the Allocation will belong.</param>
+        <param name="type">RenderScript Type describing data layout</param>
         <param name="mips">specifies desired mipmap behaviour for the
              allocation</param>
         <param name="usage">bit field specifying how the Allocation is
               utilized
 </param>
-        <param name="rs">Context to which the Allocation will belong.</param>
-        <param name="type">RenderScript Type describing data layout</param>
         <summary>Creates an Allocation for use by scripts with a given <c>android.renderscript.Type</c> and no mipmaps</summary>
         <returns>allocation</returns>
         <remarks>
@@ -4030,10 +3932,20 @@
       <Docs>
         <param name="xoff">To be added.</param>
         <param name="fp">To be added.</param>
-        <summary tool="true">This is only intended to be used by auto-generated code reflected from
- the RenderScript script files and should not be used by developers.</summary>
+        <param name="xoff&#xA;@param&#xA;@param">fp</param>
+        <summary>This is only intended to be used by auto-generated code reflected from
+            the RenderScript script files and should not be used by developers.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/renderscript/Allocation#setFromFieldPacker(int,%20android.renderscript.FieldPacker)" title="Reference documentation">Java documentation for <code>android.renderscript.Allocation.setFromFieldPacker(int, android.renderscript.FieldPacker)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 11" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/FileA3D.xml b/docs/Mono.Android/en/Android.Renderscripts/FileA3D.xml
index f97095eaa9..da6c131018 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/FileA3D.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/FileA3D.xml
@@ -180,7 +180,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/FileA3D#createFromFile(android.renderscript.RenderScript,%20java.io.File)" title="Reference documentation">Java documentation for <code>android.renderscript.FileA3D.createFromFile(android.renderscript.RenderScript, java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/FileA3D#createFromFile(android.renderscript.RenderScript,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.renderscript.FileA3D.createFromFile(android.renderscript.RenderScript, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/Font.xml b/docs/Mono.Android/en/Android.Renderscripts/Font.xml
index 644f3a51e4..9132d840db 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/Font.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/Font.xml
@@ -242,7 +242,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Font#createFromFile(android.renderscript.RenderScript,%20android.content.res.Resources,%20java.io.File,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Font.createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Font#createFromFile(android.renderscript.RenderScript,%20android.content.res.Resources,%20java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Font.createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/Matrix2f.xml b/docs/Mono.Android/en/Android.Renderscripts/Matrix2f.xml
index be7be67f8c..226b55495d 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/Matrix2f.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/Matrix2f.xml
@@ -99,12 +99,14 @@
         <Parameter Name="dataArray" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="dataArray">To be added.</param>
-        <summary>Creates a new identity 2x2 matrix</summary>
+        <param name="dataArray">values to set the matrix to, must be 4
+                             floats long</param>
+        <summary>Creates a new matrix and sets its values from the given
+            parameter</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Matrix2f#Matrix2f()" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix2f.Matrix2f()</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix2f#Matrix2f(float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix2f.Matrix2f(float[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/Matrix3f.xml b/docs/Mono.Android/en/Android.Renderscripts/Matrix3f.xml
index dfa5eb8a68..5ebb6bc0d9 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/Matrix3f.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/Matrix3f.xml
@@ -99,12 +99,14 @@
         <Parameter Name="dataArray" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="dataArray">To be added.</param>
-        <summary>Creates a new identity 3x3 matrix</summary>
+        <param name="dataArray">values to set the matrix to, must be 9
+                             floats long</param>
+        <summary>Creates a new matrix and sets its values from the given
+            parameter</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#Matrix3f()" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.Matrix3f()</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#Matrix3f(float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.Matrix3f(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -466,16 +468,16 @@
         <Parameter Name="z" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="rot">angle of rotation</param>
         <param name="x">rotation axis x</param>
         <param name="y">rotation axis y</param>
-        <param name="z">rotation axis z
-</param>
-        <param name="rot">rotation angle</param>
-        <summary>Makes the upper 2x2 a rotation matrix of the given angle</summary>
+        <param name="z">rotation axis z</param>
+        <summary>Sets current values to be a rotation matrix of certain angle
+            about a given axis</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#loadRotate(float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.loadRotate(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#loadRotate(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.loadRotate(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -562,15 +564,14 @@
         <Parameter Name="z" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="z">scale component z
-</param>
         <param name="x">scale component x</param>
         <param name="y">scale component y</param>
-        <summary>Makes the upper 2x2 a scale matrix of given dimensions</summary>
+        <param name="z">scale component z</param>
+        <summary>Sets current values to be a scale matrix of given dimensions</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#loadScale(float,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.loadScale(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#loadScale(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.loadScale(float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -748,17 +749,16 @@
         <Parameter Name="z" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="rot">angle of rotation</param>
         <param name="x">rotation axis x</param>
         <param name="y">rotation axis y</param>
-        <param name="z">rotation axis z
-</param>
-        <param name="rot">angle of rotation</param>
-        <summary>Modifies the upper 2x2 of the current matrix by
-            post-multiplying it with a rotation matrix of given angle</summary>
+        <param name="z">rotation axis z</param>
+        <summary>Modifies the current matrix by post-multiplying it with a
+            rotation matrix of certain angle about a given axis</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#rotate(float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.rotate(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#rotate(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.rotate(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -846,16 +846,15 @@
         <Parameter Name="z" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="z">scale component z
-</param>
         <param name="x">scale component x</param>
         <param name="y">scale component y</param>
-        <summary>Modifies the upper 2x2 of the current matrix by
-            post-multiplying it with a scale matrix of given dimensions</summary>
+        <param name="z">scale component z</param>
+        <summary>Modifies the current matrix by post-multiplying it with a
+            scale matrix of given dimensions</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#scale(float,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.scale(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix3f#scale(float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix3f.scale(float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/Matrix4f.xml b/docs/Mono.Android/en/Android.Renderscripts/Matrix4f.xml
index 9d32fde1d1..83ecbbcb4e 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/Matrix4f.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/Matrix4f.xml
@@ -99,12 +99,14 @@
         <Parameter Name="dataArray" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="dataArray">To be added.</param>
-        <summary>Creates a new identity 4x4 matrix</summary>
+        <param name="dataArray">values to set the matrix to, must be 16
+                             floats long</param>
+        <summary>Creates a new matrix and sets its values from the given
+            parameter</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Matrix4f#Matrix4f()" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix4f.Matrix4f()</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix4f#Matrix4f(float[])" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix4f.Matrix4f(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -371,11 +373,19 @@
         <Parameter Name="src" Type="Android.Renderscripts.Matrix4f" />
       </Parameters>
       <Docs>
-        <param name="src">matrix to load the values from
-</param>
+        <param name="src">matrix to load the values from</param>
         <summary>Sets the values of the matrix to those of the parameter</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/renderscript/Matrix4f#load(android.renderscript.Matrix4f)" title="Reference documentation">Java documentation for <code>android.renderscript.Matrix4f.load(android.renderscript.Matrix4f)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 11" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/RSSurfaceView.xml b/docs/Mono.Android/en/Android.Renderscripts/RSSurfaceView.xml
index 53290b0599..5528ab92c0 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/RSSurfaceView.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/RSSurfaceView.xml
@@ -112,7 +112,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/RSSurfaceView#RSSurfaceView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.renderscript.RSSurfaceView.RSSurfaceView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/RSSurfaceView#RSSurfaceView(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.renderscript.RSSurfaceView.RSSurfaceView(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/RSTextureView.xml b/docs/Mono.Android/en/Android.Renderscripts/RSTextureView.xml
index 29843378b8..3da8276e60 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/RSTextureView.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/RSTextureView.xml
@@ -112,7 +112,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/RSTextureView#RSTextureView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.renderscript.RSTextureView.RSTextureView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/RSTextureView#RSTextureView(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.renderscript.RSTextureView.RSTextureView(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/RenderScript.xml b/docs/Mono.Android/en/Android.Renderscripts/RenderScript.xml
index d5bc5a74f7..9458ca3b14 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/RenderScript.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/RenderScript.xml
@@ -218,8 +218,8 @@
         <Parameter Name="ct" Type="Android.Renderscripts.RenderScript+ContextType" />
       </Parameters>
       <Docs>
-        <param name="ct">The type of context to be created.</param>
         <param name="ctx">The context.</param>
+        <param name="ct">The type of context to be created.</param>
         <summary>calls create(ctx, ContextType.</summary>
         <returns>RenderScript</returns>
         <remarks>
@@ -266,9 +266,9 @@
         <Parameter Name="flags" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="ctx">The context.</param>
         <param name="ct">The type of context to be created.</param>
         <param name="flags">The OR of the CREATE_FLAG_* options desired</param>
-        <param name="ctx">The context.</param>
         <summary>calls create(ctx, ContextType.</summary>
         <returns>RenderScript</returns>
         <remarks>
@@ -315,10 +315,10 @@
         <Parameter Name="API_number" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="ctx">The context.</param>
         <param name="ct">To be added.</param>
         <param name="flags">To be added.</param>
         <param name="API_number">To be added.</param>
-        <param name="ctx">The context.</param>
         <summary>Create a RenderScript context.</summary>
         <returns>RenderScript</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/Script.xml b/docs/Mono.Android/en/Android.Renderscripts/Script.xml
index 7361a17c99..e8ab40b2d5 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/Script.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/Script.xml
@@ -337,7 +337,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#forEach(int,%20android.renderscript.Allocation,%20android.renderscript.Allocation,%20android.renderscript.FieldPacker)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#forEach(int,%20android.renderscript.Allocation[],%20android.renderscript.Allocation,%20android.renderscript.FieldPacker)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.forEach(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.FieldPacker)</code>.</a>
             </format>
           </para>
           <para>
@@ -760,7 +760,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#invoke(int)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.invoke(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#invoke(int,%20android.renderscript.FieldPacker)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.invoke(int, android.renderscript.FieldPacker)</code>.</a>
             </format>
           </para>
           <para>
@@ -922,7 +922,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20double)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20android.renderscript.BaseObj)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, android.renderscript.BaseObj)</code>.</a>
             </format>
           </para>
           <para>
@@ -968,7 +968,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20double)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20android.renderscript.FieldPacker)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, android.renderscript.FieldPacker)</code>.</a>
             </format>
           </para>
           <para>
@@ -1014,7 +1014,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20double)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1106,7 +1106,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20double)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20int)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1152,7 +1152,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20double)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20long)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1198,7 +1198,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20double)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20float)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1248,7 +1248,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20double)" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/Script#setVar(int,%20android.renderscript.FieldPacker,%20android.renderscript.Element,%20int[])" title="Reference documentation">Java documentation for <code>android.renderscript.Script.setVar(int, android.renderscript.FieldPacker, android.renderscript.Element, int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptC.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptC.xml
index 96698365cc..0cdb6653e1 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptC.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptC.xml
@@ -114,7 +114,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/ScriptC#ScriptC(int,%20android.renderscript.RenderScript)" title="Reference documentation">Java documentation for <code>android.renderscript.ScriptC.ScriptC(int, android.renderscript.RenderScript)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/ScriptC#ScriptC(long,%20android.renderscript.RenderScript)" title="Reference documentation">Java documentation for <code>android.renderscript.ScriptC.ScriptC(long, android.renderscript.RenderScript)</code>.</a>
             </format>
           </para>
           <para>
@@ -177,7 +177,6 @@
         <param name="rs">To be added.</param>
         <param name="resources">To be added.</param>
         <param name="resourceID">To be added.</param>
-        <param name="id&#xA;@param&#xA;@param">rs</param>
         <summary>Only intended for use by the generated derived classes.</summary>
         <remarks>
           <para>
@@ -225,7 +224,6 @@
         <param name="resName">To be added.</param>
         <param name="bitcode32">To be added.</param>
         <param name="bitcode64">To be added.</param>
-        <param name="id&#xA;@param&#xA;@param">rs</param>
         <summary>Only intended for use by the generated derived classes.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsic3DLUT.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsic3DLUT.xml
index 053558112d..4ac57a3c15 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsic3DLUT.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsic3DLUT.xml
@@ -163,10 +163,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">Launch options for kernel
-</param>
         <param name="ain">Input allocation</param>
         <param name="aout">Output allocation</param>
+        <param name="opt">Launch options for kernel
+</param>
         <summary>Invoke the kernel and apply the lookup to each cell of ain
             and copy to aout.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlend.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlend.xml
index 63f8e9b89d..d845a6965c 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlend.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlend.xml
@@ -183,10 +183,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = min(src + dst, 1.</summary>
         <remarks>
           <para>
@@ -354,10 +354,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = dst</summary>
         <remarks>
           <para>
@@ -448,10 +448,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>dst = dst.</summary>
         <remarks>
           <para>
@@ -542,10 +542,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = dst * src.</summary>
         <remarks>
           <para>
@@ -636,10 +636,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = dst * (1.</summary>
         <remarks>
           <para>
@@ -730,10 +730,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = dst + src * (1.</summary>
         <remarks>
           <para>
@@ -824,10 +824,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = src * dst</summary>
         <remarks>
           <para>
@@ -918,10 +918,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = src</summary>
         <remarks>
           <para>
@@ -1012,10 +1012,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>dst.</summary>
         <remarks>
           <para>
@@ -1106,10 +1106,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = src * dst.</summary>
         <remarks>
           <para>
@@ -1200,10 +1200,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = src * (1.</summary>
         <remarks>
           <para>
@@ -1294,10 +1294,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = src + dst * (1.</summary>
         <remarks>
           <para>
@@ -1388,10 +1388,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">The source buffer</param>
         <param name="aout">The destination buffer</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Sets dst = max(dst - src, 0.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlur.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlur.xml
index 0a7b8a9624..da6808db08 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlur.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicBlur.xml
@@ -200,10 +200,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="aout">Output allocation. Must match creation element
                         type.</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Apply the filter to the input and save to the specified
             allocation.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicColorMatrix.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicColorMatrix.xml
index 9d4805c9c9..21b24ef55a 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicColorMatrix.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicColorMatrix.xml
@@ -111,17 +111,17 @@
         <Parameter Name="e" Type="Android.Renderscripts.Element" />
       </Parameters>
       <Docs>
-        <param name="e">Element type for inputs and outputs, As of API 19,
-          this parameter is ignored. The Element type check is
-          performed in the kernel launch.</param>
         <param name="rs">The RenderScript context</param>
+        <param name="e">Element type for inputs and outputs, As of API 19,
+                     this parameter is ignored. The Element type check is
+                     performed in the kernel launch.</param>
         <summary>Create an intrinsic for applying a color matrix to an
             allocation.</summary>
         <returns>ScriptIntrinsicColorMatrix</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix#create(android.renderscript.RenderScript)" title="Reference documentation">Java documentation for <code>android.renderscript.ScriptIntrinsicColorMatrix.create(android.renderscript.RenderScript)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix#create(android.renderscript.RenderScript,%20android.renderscript.Element)" title="Reference documentation">Java documentation for <code>android.renderscript.ScriptIntrinsicColorMatrix.create(android.renderscript.RenderScript, android.renderscript.Element)</code>.</a>
             </format>
           </para>
           <para>
@@ -209,10 +209,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="ain">Input allocation</param>
         <param name="aout">Output allocation</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Invoke the kernel and apply the matrix to each cell of input
             <c>Allocation</c> and copy to the output <c>Allocation</c>.</summary>
         <remarks>
@@ -450,12 +450,13 @@
         <Parameter Name="m" Type="Android.Renderscripts.Matrix4f" />
       </Parameters>
       <Docs>
-        <param name="m">The 3x3 matrix to set.</param>
-        <summary>Set the color matrix which will be applied to each cell of the image.</summary>
+        <param name="m">The 4x4 matrix to set.</param>
+        <summary>Set the color matrix which will be applied to each cell of
+            the image.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix#setColorMatrix(android.renderscript.Matrix3f)" title="Reference documentation">Java documentation for <code>android.renderscript.ScriptIntrinsicColorMatrix.setColorMatrix(android.renderscript.Matrix3f)</code>.</a>
+              <a href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix#setColorMatrix(android.renderscript.Matrix4f)" title="Reference documentation">Java documentation for <code>android.renderscript.ScriptIntrinsicColorMatrix.setColorMatrix(android.renderscript.Matrix4f)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve3x3.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve3x3.xml
index 678614e154..5ab205a1a4 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve3x3.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve3x3.xml
@@ -201,10 +201,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="aout">Output allocation. Must match creation element
                         type.</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Apply the filter to the input and save to the specified
             allocation.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve5x5.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve5x5.xml
index 59faecd240..4db2f51b89 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve5x5.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicConvolve5x5.xml
@@ -201,10 +201,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="aout">Output allocation. Must match creation element
                         type.</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Apply the filter to the input and save to the specified
             allocation.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicHistogram.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicHistogram.xml
index 0918eefc39..63d8d95c58 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicHistogram.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicHistogram.xml
@@ -196,9 +196,9 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
+        <param name="ain">The input image</param>
         <param name="opt">LaunchOptions for clipping
 </param>
-        <param name="ain">The input image</param>
         <summary>Process an input buffer and place the histogram into the
             output allocation.</summary>
         <remarks>
@@ -287,9 +287,9 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
+        <param name="ain">The input image</param>
         <param name="opt">LaunchOptions for clipping
 </param>
-        <param name="ain">The input image</param>
         <summary>Process an input buffer and place the histogram into the
             output allocation.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicLUT.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicLUT.xml
index 46aed4ac27..ed64f07a75 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicLUT.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicLUT.xml
@@ -163,10 +163,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">Options for clipping
-</param>
         <param name="ain">Input allocation</param>
         <param name="aout">Output allocation</param>
+        <param name="opt">Options for clipping
+</param>
         <summary>Invoke the kernel and apply the lookup to each cell of ain
             and copy to aout.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicResize.xml b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicResize.xml
index a48f66b5a3..5a0422858f 100644
--- a/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicResize.xml
+++ b/docs/Mono.Android/en/Android.Renderscripts/ScriptIntrinsicResize.xml
@@ -193,10 +193,10 @@
         <Parameter Name="opt" Type="Android.Renderscripts.Script+LaunchOptions" />
       </Parameters>
       <Docs>
-        <param name="opt">LaunchOptions for clipping
-</param>
         <param name="aout">Output allocation. Element type must match
                         current input.  Must not be same as input.</param>
+        <param name="opt">LaunchOptions for clipping
+</param>
         <summary>Resize copy the input allocation to the output specified.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml b/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml
index dff41b7044..7b03d44b70 100644
--- a/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml
+++ b/docs/Mono.Android/en/Android.SE.Omapi/SEService.xml
@@ -58,8 +58,8 @@
       <Docs>
         <param name="context">the context of the calling application. Cannot be
                        &lt;code&gt;null&lt;/code&gt;.</param>
-        <param name="listener">a OnConnectedListener object.</param>
         <param name="executor">an Executor which will be used when invoking the callback.</param>
+        <param name="listener">a OnConnectedListener object.</param>
         <summary>Establishes a new connection that can be used to connect to all the
             Secure Elements available in the system.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.SE.Omapi/Session.xml b/docs/Mono.Android/en/Android.SE.Omapi/Session.xml
index f34fb5b336..6d686b3f1e 100644
--- a/docs/Mono.Android/en/Android.SE.Omapi/Session.xml
+++ b/docs/Mono.Android/en/Android.SE.Omapi/Session.xml
@@ -274,16 +274,16 @@
         <Parameter Name="p2" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="p2">To be added.</param>
         <param name="aid">the AID of the Applet to be selected on this channel, as a
                        byte array, or null if no Applet is to be selected.</param>
-        <summary>This method is provided to ease the development of mobile application and for compliancy
-            with existing applications.</summary>
+        <param name="p2">the P2 parameter of the SELECT APDU executed on this channel.</param>
+        <summary>Get an access to the basic channel, as defined in the ISO/IEC 7816-4 specification (the
+            one that has number 0).</summary>
         <returns>an instance of Channel if available or null.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/se/omapi/Session#openBasicChannel(byte[])" title="Reference documentation">Java documentation for <code>android.se.omapi.Session.openBasicChannel(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/se/omapi/Session#openBasicChannel(byte[],%20byte)" title="Reference documentation">Java documentation for <code>android.se.omapi.Session.openBasicChannel(byte[], byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -361,17 +361,17 @@
         <Parameter Name="p2" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="p2">To be added.</param>
         <param name="aid">the AID of the Applet to be selected on this channel, as a
                        byte array.</param>
-        <summary>This method is provided to ease the development of mobile application and for compliancy
-            with existing applications.</summary>
+        <param name="p2">the P2 parameter of the SELECT APDU executed on this channel.</param>
+        <summary>Open a logical channel with the Secure Element, selecting the Applet represented by
+            the given AID.</summary>
         <returns>an instance of Channel. Null if the Secure Element is unable to
                     provide a new logical channel.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/se/omapi/Session#openLogicalChannel(byte[])" title="Reference documentation">Java documentation for <code>android.se.omapi.Session.openLogicalChannel(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/se/omapi/Session#openLogicalChannel(byte[],%20byte)" title="Reference documentation">Java documentation for <code>android.se.omapi.Session.openLogicalChannel(byte[], byte)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Sax/Element.xml b/docs/Mono.Android/en/Android.Sax/Element.xml
index 6c1eb22898..630b8437f4 100644
--- a/docs/Mono.Android/en/Android.Sax/Element.xml
+++ b/docs/Mono.Android/en/Android.Sax/Element.xml
@@ -169,7 +169,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/sax/Element#getChild(java.lang.String)" title="Reference documentation">Java documentation for <code>android.sax.Element.getChild(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/sax/Element#getChild(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.sax.Element.getChild(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -284,7 +284,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/sax/Element#requireChild(java.lang.String)" title="Reference documentation">Java documentation for <code>android.sax.Element.requireChild(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/sax/Element#requireChild(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.sax.Element.requireChild(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Sax/RootElement.xml b/docs/Mono.Android/en/Android.Sax/RootElement.xml
index 38de8716ac..b5d18526cc 100644
--- a/docs/Mono.Android/en/Android.Sax/RootElement.xml
+++ b/docs/Mono.Android/en/Android.Sax/RootElement.xml
@@ -115,13 +115,13 @@
         <Parameter Name="localName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
+        <param name="uri">the namespace</param>
         <param name="localName">the local name</param>
         <summary>Constructs a new root element with the given name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/sax/RootElement#RootElement(java.lang.String)" title="Reference documentation">Java documentation for <code>android.sax.RootElement.RootElement(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/sax/RootElement#RootElement(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.sax.RootElement.RootElement(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/AlreadyPersonalizedException.xml b/docs/Mono.Android/en/Android.Security.Identity/AlreadyPersonalizedException.xml
index b9ee8ea31d..9c95d945dd 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/AlreadyPersonalizedException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/AlreadyPersonalizedException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>AlreadyPersonalizedException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/AlreadyPersonalizedException#AlreadyPersonalizedException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.AlreadyPersonalizedException.AlreadyPersonalizedException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/AlreadyPersonalizedException#AlreadyPersonalizedException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.AlreadyPersonalizedException.AlreadyPersonalizedException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/CipherSuiteNotSupportedException.xml b/docs/Mono.Android/en/Android.Security.Identity/CipherSuiteNotSupportedException.xml
index d0d91c2d78..455f18d901 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/CipherSuiteNotSupportedException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/CipherSuiteNotSupportedException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>CipherSuiteNotSupportedException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/CipherSuiteNotSupportedException#CipherSuiteNotSupportedException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.CipherSuiteNotSupportedException.CipherSuiteNotSupportedException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/CipherSuiteNotSupportedException#CipherSuiteNotSupportedException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.CipherSuiteNotSupportedException.CipherSuiteNotSupportedException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/DocTypeNotSupportedException.xml b/docs/Mono.Android/en/Android.Security.Identity/DocTypeNotSupportedException.xml
index cc797c5548..53fb93fec0 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/DocTypeNotSupportedException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/DocTypeNotSupportedException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>DocTypeNotSupportedException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/DocTypeNotSupportedException#DocTypeNotSupportedException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.DocTypeNotSupportedException.DocTypeNotSupportedException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/DocTypeNotSupportedException#DocTypeNotSupportedException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.DocTypeNotSupportedException.DocTypeNotSupportedException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/EphemeralPublicKeyNotFoundException.xml b/docs/Mono.Android/en/Android.Security.Identity/EphemeralPublicKeyNotFoundException.xml
index c78a20ae3c..04a114a904 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/EphemeralPublicKeyNotFoundException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/EphemeralPublicKeyNotFoundException.xml
@@ -112,13 +112,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>EphemeralPublicKeyNotFoundException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/EphemeralPublicKeyNotFoundException#EphemeralPublicKeyNotFoundException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.EphemeralPublicKeyNotFoundException.EphemeralPublicKeyNotFoundException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/EphemeralPublicKeyNotFoundException#EphemeralPublicKeyNotFoundException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.EphemeralPublicKeyNotFoundException.EphemeralPublicKeyNotFoundException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/IdentityCredential.xml b/docs/Mono.Android/en/Android.Security.Identity/IdentityCredential.xml
index 8598870a76..6ea1706ad6 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/IdentityCredential.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/IdentityCredential.xml
@@ -618,7 +618,6 @@
         <param name="authenticationKey">The dynamic authentication key for which certification and
                                      associated static
                                      authentication data is being provided.</param>
-        <param name="expirationDate">The expiration date of the static authentication data.</param>
         <param name="staticAuthData">Static authentication data provided by the issuer that validates
                                      the authenticity
                                      and integrity of the credential data fields.</param>
@@ -626,7 +625,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/IdentityCredential#storeStaticAuthenticationData(java.security.cert.X509Certificate,%20java.time.Instant,%20byte[])" title="Reference documentation">Java documentation for <code>android.security.identity.IdentityCredential.storeStaticAuthenticationData(java.security.cert.X509Certificate, java.time.Instant, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/IdentityCredential#storeStaticAuthenticationData(java.security.cert.X509Certificate,%20byte[])" title="Reference documentation">Java documentation for <code>android.security.identity.IdentityCredential.storeStaticAuthenticationData(java.security.cert.X509Certificate, byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/IdentityCredentialException.xml b/docs/Mono.Android/en/Android.Security.Identity/IdentityCredentialException.xml
index 6cfd7b807d..209f0ef6d9 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/IdentityCredentialException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/IdentityCredentialException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>IdentityCredentialException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/IdentityCredentialException#IdentityCredentialException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.IdentityCredentialException.IdentityCredentialException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/IdentityCredentialException#IdentityCredentialException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.IdentityCredentialException.IdentityCredentialException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/InvalidReaderSignatureException.xml b/docs/Mono.Android/en/Android.Security.Identity/InvalidReaderSignatureException.xml
index ce3ce0dd70..3a2aa4a82b 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/InvalidReaderSignatureException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/InvalidReaderSignatureException.xml
@@ -112,13 +112,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>InvalidReaderSignatureException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/InvalidReaderSignatureException#InvalidReaderSignatureException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.InvalidReaderSignatureException.InvalidReaderSignatureException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/InvalidReaderSignatureException#InvalidReaderSignatureException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.InvalidReaderSignatureException.InvalidReaderSignatureException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/InvalidRequestMessageException.xml b/docs/Mono.Android/en/Android.Security.Identity/InvalidRequestMessageException.xml
index ee7c680942..e8c8229198 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/InvalidRequestMessageException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/InvalidRequestMessageException.xml
@@ -112,13 +112,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>InvalidRequestMessageException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/InvalidRequestMessageException#InvalidRequestMessageException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.InvalidRequestMessageException.InvalidRequestMessageException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/InvalidRequestMessageException#InvalidRequestMessageException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.InvalidRequestMessageException.InvalidRequestMessageException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/MessageDecryptionException.xml b/docs/Mono.Android/en/Android.Security.Identity/MessageDecryptionException.xml
index 240f2ed513..4d446e2749 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/MessageDecryptionException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/MessageDecryptionException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>MessageDecryptionException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/MessageDecryptionException#MessageDecryptionException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.MessageDecryptionException.MessageDecryptionException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/MessageDecryptionException#MessageDecryptionException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.MessageDecryptionException.MessageDecryptionException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/NoAuthenticationKeyAvailableException.xml b/docs/Mono.Android/en/Android.Security.Identity/NoAuthenticationKeyAvailableException.xml
index 223658c18e..47208901b6 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/NoAuthenticationKeyAvailableException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/NoAuthenticationKeyAvailableException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>NoAuthenticationKeyAvailableException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/NoAuthenticationKeyAvailableException#NoAuthenticationKeyAvailableException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.NoAuthenticationKeyAvailableException.NoAuthenticationKeyAvailableException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/NoAuthenticationKeyAvailableException#NoAuthenticationKeyAvailableException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.NoAuthenticationKeyAvailableException.NoAuthenticationKeyAvailableException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/SessionTranscriptMismatchException.xml b/docs/Mono.Android/en/Android.Security.Identity/SessionTranscriptMismatchException.xml
index aed8163e5c..3222d2e603 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/SessionTranscriptMismatchException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/SessionTranscriptMismatchException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>SessionTranscriptMismatchException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/SessionTranscriptMismatchException#SessionTranscriptMismatchException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.SessionTranscriptMismatchException.SessionTranscriptMismatchException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/SessionTranscriptMismatchException#SessionTranscriptMismatchException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.SessionTranscriptMismatchException.SessionTranscriptMismatchException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Identity/UnknownAuthenticationKeyException.xml b/docs/Mono.Android/en/Android.Security.Identity/UnknownAuthenticationKeyException.xml
index 8a51d592a4..94f1201a5e 100644
--- a/docs/Mono.Android/en/Android.Security.Identity/UnknownAuthenticationKeyException.xml
+++ b/docs/Mono.Android/en/Android.Security.Identity/UnknownAuthenticationKeyException.xml
@@ -111,13 +111,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message.</param>
+        <param name="cause">the cause.</param>
         <summary>Constructs a new <c>UnknownAuthenticationKeyException</c> exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/identity/UnknownAuthenticationKeyException#UnknownAuthenticationKeyException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.identity.UnknownAuthenticationKeyException.UnknownAuthenticationKeyException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/identity/UnknownAuthenticationKeyException#UnknownAuthenticationKeyException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.identity.UnknownAuthenticationKeyException.UnknownAuthenticationKeyException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Keystore/BackendBusyException.xml b/docs/Mono.Android/en/Android.Security.Keystore/BackendBusyException.xml
index 299976edad..30359c24f1 100644
--- a/docs/Mono.Android/en/Android.Security.Keystore/BackendBusyException.xml
+++ b/docs/Mono.Android/en/Android.Security.Keystore/BackendBusyException.xml
@@ -92,11 +92,12 @@
       <Docs>
         <param name="backOffHintMillis">To be added.</param>
         <param name="message">To be added.</param>
-        <summary>Constructs a new <c>BackendBusyException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>BackendBusyException</c> with the provided detail message and
+            no cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/BackendBusyException#BackendBusyException(long)" title="Reference documentation">Java documentation for <code>android.security.keystore.BackendBusyException.BackendBusyException(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/BackendBusyException#BackendBusyException(long,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.keystore.BackendBusyException.BackendBusyException(long, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,11 +154,12 @@
         <param name="backOffHintMillis">To be added.</param>
         <param name="message">To be added.</param>
         <param name="cause">To be added.</param>
-        <summary>Constructs a new <c>BackendBusyException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>BackendBusyException</c> with the provided detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/BackendBusyException#BackendBusyException(long)" title="Reference documentation">Java documentation for <code>android.security.keystore.BackendBusyException.BackendBusyException(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/BackendBusyException#BackendBusyException(long,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.keystore.BackendBusyException.BackendBusyException(long, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Keystore/KeyExpiredException.xml b/docs/Mono.Android/en/Android.Security.Keystore/KeyExpiredException.xml
index 2c2ef5f6b6..49156d8bbf 100644
--- a/docs/Mono.Android/en/Android.Security.Keystore/KeyExpiredException.xml
+++ b/docs/Mono.Android/en/Android.Security.Keystore/KeyExpiredException.xml
@@ -87,11 +87,11 @@
       </Parameters>
       <Docs>
         <param name="message">To be added.</param>
-        <summary>Constructs a new <c>KeyExpiredException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>KeyExpiredException</c> with the provided detail message and no cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/KeyExpiredException#KeyExpiredException()" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyExpiredException.KeyExpiredException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/KeyExpiredException#KeyExpiredException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyExpiredException.KeyExpiredException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -148,11 +148,11 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="cause">To be added.</param>
-        <summary>Constructs a new <c>KeyExpiredException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>KeyExpiredException</c> with the provided detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/KeyExpiredException#KeyExpiredException()" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyExpiredException.KeyExpiredException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/KeyExpiredException#KeyExpiredException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyExpiredException.KeyExpiredException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Keystore/KeyNotYetValidException.xml b/docs/Mono.Android/en/Android.Security.Keystore/KeyNotYetValidException.xml
index b3e22a7ea3..6959ba5130 100644
--- a/docs/Mono.Android/en/Android.Security.Keystore/KeyNotYetValidException.xml
+++ b/docs/Mono.Android/en/Android.Security.Keystore/KeyNotYetValidException.xml
@@ -87,11 +87,12 @@
       </Parameters>
       <Docs>
         <param name="message">To be added.</param>
-        <summary>Constructs a new <c>KeyNotYetValidException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>KeyNotYetValidException</c> with the provided detail message and no
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/KeyNotYetValidException#KeyNotYetValidException()" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyNotYetValidException.KeyNotYetValidException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/KeyNotYetValidException#KeyNotYetValidException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyNotYetValidException.KeyNotYetValidException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -148,11 +149,11 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="cause">To be added.</param>
-        <summary>Constructs a new <c>KeyNotYetValidException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>KeyNotYetValidException</c> with the provided detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/KeyNotYetValidException#KeyNotYetValidException()" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyNotYetValidException.KeyNotYetValidException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/KeyNotYetValidException#KeyNotYetValidException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyNotYetValidException.KeyNotYetValidException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Keystore/KeyPermanentlyInvalidatedException.xml b/docs/Mono.Android/en/Android.Security.Keystore/KeyPermanentlyInvalidatedException.xml
index 643d605308..b577a784f7 100644
--- a/docs/Mono.Android/en/Android.Security.Keystore/KeyPermanentlyInvalidatedException.xml
+++ b/docs/Mono.Android/en/Android.Security.Keystore/KeyPermanentlyInvalidatedException.xml
@@ -86,11 +86,12 @@
       </Parameters>
       <Docs>
         <param name="message">To be added.</param>
-        <summary>Constructs a new <c>KeyPermanentlyInvalidatedException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>KeyPermanentlyInvalidatedException</c> with the provided detail message
+            and no cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/KeyPermanentlyInvalidatedException#KeyPermanentlyInvalidatedException()" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyPermanentlyInvalidatedException.KeyPermanentlyInvalidatedException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/KeyPermanentlyInvalidatedException#KeyPermanentlyInvalidatedException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyPermanentlyInvalidatedException.KeyPermanentlyInvalidatedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -147,11 +148,12 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="cause">To be added.</param>
-        <summary>Constructs a new <c>KeyPermanentlyInvalidatedException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>KeyPermanentlyInvalidatedException</c> with the provided detail message
+            and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/KeyPermanentlyInvalidatedException#KeyPermanentlyInvalidatedException()" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyPermanentlyInvalidatedException.KeyPermanentlyInvalidatedException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/KeyPermanentlyInvalidatedException#KeyPermanentlyInvalidatedException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.keystore.KeyPermanentlyInvalidatedException.KeyPermanentlyInvalidatedException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Keystore/UserNotAuthenticatedException.xml b/docs/Mono.Android/en/Android.Security.Keystore/UserNotAuthenticatedException.xml
index 9bde5bd776..24c491fe9f 100644
--- a/docs/Mono.Android/en/Android.Security.Keystore/UserNotAuthenticatedException.xml
+++ b/docs/Mono.Android/en/Android.Security.Keystore/UserNotAuthenticatedException.xml
@@ -87,11 +87,12 @@
       </Parameters>
       <Docs>
         <param name="message">To be added.</param>
-        <summary>Constructs a new <c>UserNotAuthenticatedException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>UserNotAuthenticatedException</c> with the provided detail message and
+            no cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/UserNotAuthenticatedException#UserNotAuthenticatedException()" title="Reference documentation">Java documentation for <code>android.security.keystore.UserNotAuthenticatedException.UserNotAuthenticatedException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/UserNotAuthenticatedException#UserNotAuthenticatedException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.keystore.UserNotAuthenticatedException.UserNotAuthenticatedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -148,11 +149,12 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="cause">To be added.</param>
-        <summary>Constructs a new <c>UserNotAuthenticatedException</c> without detail message and cause.</summary>
+        <summary>Constructs a new <c>UserNotAuthenticatedException</c> with the provided detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/UserNotAuthenticatedException#UserNotAuthenticatedException()" title="Reference documentation">Java documentation for <code>android.security.keystore.UserNotAuthenticatedException.UserNotAuthenticatedException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/UserNotAuthenticatedException#UserNotAuthenticatedException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.keystore.UserNotAuthenticatedException.UserNotAuthenticatedException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security.Keystore/UserPresenceUnavailableException.xml b/docs/Mono.Android/en/Android.Security.Keystore/UserPresenceUnavailableException.xml
index 8c760d12cc..37dd6f61c8 100644
--- a/docs/Mono.Android/en/Android.Security.Keystore/UserPresenceUnavailableException.xml
+++ b/docs/Mono.Android/en/Android.Security.Keystore/UserPresenceUnavailableException.xml
@@ -87,11 +87,12 @@
       </Parameters>
       <Docs>
         <param name="message">To be added.</param>
-        <summary>Constructs a <c>UserPresenceUnavailableException</c> without a detail message or cause.</summary>
+        <summary>Constructs a <c>UserPresenceUnavailableException</c> using the provided detail message
+            but no cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/UserPresenceUnavailableException#UserPresenceUnavailableException()" title="Reference documentation">Java documentation for <code>android.security.keystore.UserPresenceUnavailableException.UserPresenceUnavailableException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/UserPresenceUnavailableException#UserPresenceUnavailableException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.keystore.UserPresenceUnavailableException.UserPresenceUnavailableException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -146,11 +147,12 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="cause">To be added.</param>
-        <summary>Constructs a <c>UserPresenceUnavailableException</c> without a detail message or cause.</summary>
+        <summary>Constructs a <c>UserPresenceUnavailableException</c> using the provided detail message
+            and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/keystore/UserPresenceUnavailableException#UserPresenceUnavailableException()" title="Reference documentation">Java documentation for <code>android.security.keystore.UserPresenceUnavailableException.UserPresenceUnavailableException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/keystore/UserPresenceUnavailableException#UserPresenceUnavailableException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.keystore.UserPresenceUnavailableException.UserPresenceUnavailableException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security/KeyChain.xml b/docs/Mono.Android/en/Android.Security/KeyChain.xml
index 1690fdbfbc..2d3a3e367f 100644
--- a/docs/Mono.Android/en/Android.Security/KeyChain.xml
+++ b/docs/Mono.Android/en/Android.Security/KeyChain.xml
@@ -306,10 +306,6 @@
         <Parameter Name="alias" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="host">The host name of the server requesting the
-     certificate, or null if unavailable.</param>
-        <param name="port">The port number of the server requesting the
-     certificate, or -1 if unavailable.</param>
         <param name="activity">The <c>Activity</c> context to use for
                 launching the new sub-Activity to prompt the user to select
                 a private key; used only to call startActivity(); must not
@@ -320,8 +316,10 @@
                 "RSA", "EC" or null.</param>
         <param name="issuers">The acceptable certificate issuers for the
                 certificate matching the private key, or null.</param>
-        <param name="uri">The full URI the server is requesting the certificate
-                for, or null if unavailable.</param>
+        <param name="host">The host name of the server requesting the
+                certificate, or null if unavailable.</param>
+        <param name="port">The port number of the server requesting the
+                certificate, or -1 if unavailable.</param>
         <param name="alias">The alias to preselect if available, or null if
                 unavailable.</param>
         <summary>Launches an <c>Activity</c> for the user to select the alias
@@ -329,7 +327,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/KeyChain#choosePrivateKeyAlias(android.app.Activity,%20android.security.KeyChainAliasCallback,%20java.lang.String[],%20java.security.Principal[],%20android.net.Uri,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.KeyChain.choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], android.net.Uri, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/KeyChain#choosePrivateKeyAlias(android.app.Activity,%20android.security.KeyChainAliasCallback,%20java.lang.String[],%20java.security.Principal[],%20java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.KeyChain.choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security/KeyChainException.xml b/docs/Mono.Android/en/Android.Security/KeyChainException.xml
index afc63ba933..d252809368 100644
--- a/docs/Mono.Android/en/Android.Security/KeyChainException.xml
+++ b/docs/Mono.Android/en/Android.Security/KeyChainException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new <c>KeyChainException</c> that includes the
-            current stack trace.</summary>
+        <param name="cause">the cause of this exception, may be <c>null</c>.</param>
+        <summary>Constructs a new <c>KeyChainException</c> with the current stack
+            trace and the specified cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/KeyChainException#KeyChainException()" title="Reference documentation">Java documentation for <code>android.security.KeyChainException.KeyChainException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/KeyChainException#KeyChainException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.KeyChainException.KeyChainException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +126,13 @@
         <Parameter Name="detailMessage" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs a new <c>KeyChainException</c> that includes the
-            current stack trace.</summary>
+        <param name="detailMessage">the detail message for this exception.</param>
+        <summary>Constructs a new <c>KeyChainException</c> with the current stack
+            trace and the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/KeyChainException#KeyChainException()" title="Reference documentation">Java documentation for <code>android.security.KeyChainException.KeyChainException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/KeyChainException#KeyChainException(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.KeyChainException.KeyChainException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,14 +188,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new <c>KeyChainException</c> that includes the
-            current stack trace.</summary>
+        <param name="message">the detail message for this exception.</param>
+        <param name="cause">the cause of this exception, may be <c>null</c>.</param>
+        <summary>Constructs a new <c>KeyChainException</c> with the current stack
+            trace, the specified detail message and the specified cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/KeyChainException#KeyChainException()" title="Reference documentation">Java documentation for <code>android.security.KeyChainException.KeyChainException()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/KeyChainException#KeyChainException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.security.KeyChainException.KeyChainException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Security/NetworkSecurityPolicy.xml b/docs/Mono.Android/en/Android.Security/NetworkSecurityPolicy.xml
index ce6f47fb80..77bca2fa79 100644
--- a/docs/Mono.Android/en/Android.Security/NetworkSecurityPolicy.xml
+++ b/docs/Mono.Android/en/Android.Security/NetworkSecurityPolicy.xml
@@ -121,7 +121,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/security/NetworkSecurityPolicy#isCleartextTrafficPermitted()" title="Reference documentation">Java documentation for <code>android.security.NetworkSecurityPolicy.isCleartextTrafficPermitted()</code>.</a>
+              <a href="https://developer.android.com/reference/android/security/NetworkSecurityPolicy#isCleartextTrafficPermitted(java.lang.String)" title="Reference documentation">Java documentation for <code>android.security.NetworkSecurityPolicy.isCleartextTrafficPermitted(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Service.Autofill/SaveCallback.xml b/docs/Mono.Android/en/Android.Service.Autofill/SaveCallback.xml
index 4be7bc5fef..c43916b059 100644
--- a/docs/Mono.Android/en/Android.Service.Autofill/SaveCallback.xml
+++ b/docs/Mono.Android/en/Android.Service.Autofill/SaveCallback.xml
@@ -204,14 +204,15 @@
         <Parameter Name="intentSender" Type="Android.Content.IntentSender" />
       </Parameters>
       <Docs>
-        <param name="intentSender">To be added.</param>
+        <param name="intentSender">intent that will be launched from the context of activity being
+            autofilled.</param>
         <summary>Notifies the Android System that an
             <c>AutofillService#onSaveRequest(SaveRequest, SaveCallback)</c> was successfully handled
             by the service.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/service/autofill/SaveCallback#onSuccess()" title="Reference documentation">Java documentation for <code>android.service.autofill.SaveCallback.onSuccess()</code>.</a>
+              <a href="https://developer.android.com/reference/android/service/autofill/SaveCallback#onSuccess(android.content.IntentSender)" title="Reference documentation">Java documentation for <code>android.service.autofill.SaveCallback.onSuccess(android.content.IntentSender)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier.xml b/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier.xml
index 7adacdac71..8836aebb64 100644
--- a/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier.xml
+++ b/docs/Mono.Android/en/Android.Service.Carrier/CarrierIdentifier.xml
@@ -92,11 +92,22 @@
         <Parameter Name="gid2" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="mccMnc">To be added.</param>
-        <param name="gid1">To be added.</param>
-        <param name="gid2">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="mccMnc">A 3-byte array as defined by 3GPP TS 24.008.</param>
+        <param name="gid1">The group identifier level 1.</param>
+        <param name="gid2">The group identifier level 2.</param>
+        <summary>Creates a carrier identifier instance.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier#CarrierIdentifier(byte[],%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.carrier.CarrierIdentifier.CarrierIdentifier(byte[], java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -163,16 +174,29 @@
         <Parameter Name="specificCarrierId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="mcc">To be added.</param>
-        <param name="mnc">To be added.</param>
-        <param name="spn">To be added.</param>
-        <param name="imsi">To be added.</param>
-        <param name="gid1">To be added.</param>
-        <param name="gid2">To be added.</param>
-        <param name="carrierid">To be added.</param>
-        <param name="specificCarrierId">To be added.</param>
+        <param name="mcc">mobile country code</param>
+        <param name="mnc">mobile network code</param>
+        <param name="spn">service provider name</param>
+        <param name="imsi">International Mobile Subscriber Identity <c>TelephonyManager#getSubscriberId()</c></param>
+        <param name="gid1">group id level 1 <c>TelephonyManager#getGroupIdLevel1()</c></param>
+        <param name="gid2">group id level 2</param>
+        <param name="carrierid">carrier unique identifier <c>TelephonyManager#getSimCarrierId()</c>, used
+                             to uniquely identify the carrier and look up the carrier configurations.</param>
+        <param name="specificCarrierId">specific carrier identifier
+            <c>TelephonyManager#getSimSpecificCarrierId()</c></param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier#CarrierIdentifier(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.service.carrier.CarrierIdentifier.CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="CarrierId">
diff --git a/docs/Mono.Android/en/Android.Service.Carrier/CarrierMessagingService.xml b/docs/Mono.Android/en/Android.Service.Carrier/CarrierMessagingService.xml
index eb1e405a26..00f49b43b6 100644
--- a/docs/Mono.Android/en/Android.Service.Carrier/CarrierMessagingService.xml
+++ b/docs/Mono.Android/en/Android.Service.Carrier/CarrierMessagingService.xml
@@ -326,8 +326,6 @@
         <param name="subId">SMS subscription ID of the SIM</param>
         <param name="destAddress">phone number of the recipient of the message</param>
         <param name="destPort">the destination port</param>
-        <param name="sendSmsFlag">Flag for sending SMS. Acceptable values are 0 and
-                   <c>#SEND_FLAG_REQUEST_DELIVERY_STATUS</c>.</param>
         <param name="callback">result callback. Call with a <c>SendSmsResult</c>.</param>
         <summary>Override this method to intercept binary SMSs sent from the device.</summary>
         <remarks>
@@ -463,8 +461,6 @@
         <param name="parts">a <c>List</c> of the message parts</param>
         <param name="subId">SMS subscription ID of the SIM</param>
         <param name="destAddress">phone number of the recipient of the message</param>
-        <param name="sendSmsFlag">Flag for sending SMS. Acceptable values are 0 and
-                   <c>#SEND_FLAG_REQUEST_DELIVERY_STATUS</c>.</param>
         <param name="callback">result callback. Call with a <c>SendMultipartSmsResult</c>.</param>
         <summary>Override this method to intercept long SMSs sent from the device.</summary>
         <remarks>
@@ -562,8 +558,6 @@
         <param name="text">the text to send</param>
         <param name="subId">SMS subscription ID of the SIM</param>
         <param name="destAddress">phone number of the recipient of the message</param>
-        <param name="sendSmsFlag">Flag for sending SMS. Acceptable values are 0 and
-                   <c>#SEND_FLAG_REQUEST_DELIVERY_STATUS</c>.</param>
         <param name="callback">result callback. Call with a <c>SendSmsResult</c>.</param>
         <summary>Override this method to intercept text SMSs sent from the device.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Actions/BooleanAction.xml b/docs/Mono.Android/en/Android.Service.Controls.Actions/BooleanAction.xml
index c9c3b0eef0..03ca8a9d47 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Actions/BooleanAction.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Actions/BooleanAction.xml
@@ -54,10 +54,21 @@
         <Parameter Name="newState" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="newState">To be added.</param>
+        <param name="templateId">the identifier of the <c>ToggleTemplate</c> that produced this action.</param>
+        <param name="newState">new value for the state displayed by the <c>ToggleTemplate</c>.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/BooleanAction#BooleanAction(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.BooleanAction.BooleanAction(java.lang.String, boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -82,11 +93,24 @@
         <Parameter Name="challengeValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="newState">To be added.</param>
-        <param name="challengeValue">To be added.</param>
+        <param name="templateId">the identifier of the template that originated this action.</param>
+        <param name="newState">new value for the state displayed by the template.</param>
+        <param name="challengeValue">a value sent by the user along with the action to authenticate. <c></c>
+                                  null is sent when no authentication is needed or has not been
+                                  requested.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/BooleanAction#BooleanAction(java.lang.String,%20boolean,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.BooleanAction.BooleanAction(java.lang.String, boolean, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="ActionType">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Actions/CommandAction.xml b/docs/Mono.Android/en/Android.Service.Controls.Actions/CommandAction.xml
index f0fb829683..10b8aad93c 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Actions/CommandAction.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Actions/CommandAction.xml
@@ -54,9 +54,21 @@
         <Parameter Name="templateId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
+        <param name="templateId">the identifier of the <c>StatelessTemplate</c> that originated this
+                              action.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/CommandAction#CommandAction(java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.CommandAction.CommandAction(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -80,10 +92,24 @@
         <Parameter Name="challengeValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="challengeValue">To be added.</param>
+        <param name="templateId">the identifier of the <c>StatelessTemplate</c> that originated this
+                              action.</param>
+        <param name="challengeValue">a value sent by the user along with the action to authenticate. <c></c>
+                                  null is sent when no authentication is needed or has not been
+                                  requested.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/CommandAction#CommandAction(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.CommandAction.CommandAction(java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="ActionType">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Actions/FloatAction.xml b/docs/Mono.Android/en/Android.Service.Controls.Actions/FloatAction.xml
index 23e067a8cb..463dd66b05 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Actions/FloatAction.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Actions/FloatAction.xml
@@ -54,10 +54,21 @@
         <Parameter Name="newValue" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="newValue">To be added.</param>
+        <param name="templateId">the identifier of the <c>RangeTemplate</c> that produced this action.</param>
+        <param name="newValue">new value for the state displayed by the <c>RangeTemplate</c>.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/FloatAction#FloatAction(java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.FloatAction.FloatAction(java.lang.String, float)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -82,11 +93,24 @@
         <Parameter Name="challengeValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="newValue">To be added.</param>
-        <param name="challengeValue">To be added.</param>
+        <param name="templateId">the identifier of the <c>RangeTemplate</c> that originated this action.</param>
+        <param name="newValue">new value for the state of the <c>RangeTemplate</c>.</param>
+        <param name="challengeValue">a value sent by the user along with the action to authenticate. <c></c>
+                                  null is sent when no authentication is needed or has not been
+                                  requested.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/FloatAction#FloatAction(java.lang.String,%20float,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.FloatAction.FloatAction(java.lang.String, float, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="ActionType">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Actions/ModeAction.xml b/docs/Mono.Android/en/Android.Service.Controls.Actions/ModeAction.xml
index 0f696737be..d7acda4e7e 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Actions/ModeAction.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Actions/ModeAction.xml
@@ -54,10 +54,22 @@
         <Parameter Name="newMode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="newMode">To be added.</param>
+        <param name="templateId">the identifier of the <c>TemperatureControlTemplate</c> that originated
+                              this action.</param>
+        <param name="newMode">new value for the mode.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/ModeAction#ModeAction(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.ModeAction.ModeAction(java.lang.String, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -82,11 +94,25 @@
         <Parameter Name="challengeValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="newMode">To be added.</param>
-        <param name="challengeValue">To be added.</param>
+        <param name="templateId">the identifier of the <c>TemperatureControlTemplate</c> that originated
+                              this action.</param>
+        <param name="newMode">new value for the mode.</param>
+        <param name="challengeValue">a value sent by the user along with the action to authenticate. <c></c>
+                                  null is sent when no authentication is needed or has not been
+                                  requested.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/actions/ModeAction#ModeAction(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.controls.actions.ModeAction.ModeAction(java.lang.String, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="ActionType">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Templates/RangeTemplate.xml b/docs/Mono.Android/en/Android.Service.Controls.Templates/RangeTemplate.xml
index e238956ae8..47b88406fe 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Templates/RangeTemplate.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Templates/RangeTemplate.xml
@@ -58,14 +58,26 @@
         <Parameter Name="formatString" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="minValue">To be added.</param>
-        <param name="maxValue">To be added.</param>
-        <param name="currentValue">To be added.</param>
-        <param name="stepValue">To be added.</param>
-        <param name="formatString">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="templateId">the identifier for this template object</param>
+        <param name="minValue">minimum value for the input</param>
+        <param name="maxValue">maximum value for the input</param>
+        <param name="currentValue">the current value of the <c>Control</c> containing this object.</param>
+        <param name="stepValue">minimum value of increments/decrements when interacting with this control.</param>
+        <param name="formatString">a formatting string as per <c>String#format</c> used to display the
+                               <c>currentValue</c>. If <c>null</c> is passed, the "%.1f" is used.</param>
+        <summary>Construct a new <c>RangeTemplate</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate#RangeTemplate(java.lang.String,%20float,%20float,%20float,%20float,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.service.controls.templates.RangeTemplate.RangeTemplate(java.lang.String, float, float, float, float, java.lang.CharSequence)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Templates/StatelessTemplate.xml b/docs/Mono.Android/en/Android.Service.Controls.Templates/StatelessTemplate.xml
index cc8ff45be2..ec83b9605f 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Templates/StatelessTemplate.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Templates/StatelessTemplate.xml
@@ -53,9 +53,20 @@
         <Parameter Name="templateId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="templateId">the identifier for this template</param>
+        <summary>Construct a new <c>StatelessTemplate</c></summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/templates/StatelessTemplate#StatelessTemplate(java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.controls.templates.StatelessTemplate.StatelessTemplate(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="JniPeerMembers">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Templates/TemperatureControlTemplate.xml b/docs/Mono.Android/en/Android.Service.Controls.Templates/TemperatureControlTemplate.xml
index 2870f3a8ae..bfbbda1230 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Templates/TemperatureControlTemplate.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Templates/TemperatureControlTemplate.xml
@@ -78,13 +78,24 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="controlTemplate">To be added.</param>
-        <param name="currentMode">To be added.</param>
-        <param name="currentActiveMode">To be added.</param>
-        <param name="modesFlag">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="templateId">the identifier for this template object</param>
+        <param name="controlTemplate">a template to use for interaction with the user</param>
+        <param name="currentMode">the current mode for the <c>Control</c></param>
+        <param name="currentActiveMode">the current active mode for the <c>Control</c></param>
+        <param name="modesFlag">a flag representing the available modes for the <c>Control</c></param>
+        <summary>Construct a new <c>TemperatureControlTemplate</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate#TemperatureControlTemplate(java.lang.String,%20android.service.controls.templates.ControlTemplate,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.service.controls.templates.TemperatureControlTemplate.TemperatureControlTemplate(java.lang.String, android.service.controls.templates.ControlTemplate, int, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="CurrentActiveMode">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Templates/ThumbnailTemplate.xml b/docs/Mono.Android/en/Android.Service.Controls.Templates/ThumbnailTemplate.xml
index 12d0658c12..2485c20237 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Templates/ThumbnailTemplate.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Templates/ThumbnailTemplate.xml
@@ -56,12 +56,23 @@
         <Parameter Name="contentDescription" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="active">To be added.</param>
-        <param name="thumbnail">To be added.</param>
-        <param name="contentDescription">To be added.</param>
+        <param name="templateId">the identifier for this template object</param>
+        <param name="active">whether the image corresponds to an active (live) stream.</param>
+        <param name="thumbnail">an image to display on the <c>Control</c></param>
+        <param name="contentDescription">a description of the image for accessibility.</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/templates/ThumbnailTemplate#ThumbnailTemplate(java.lang.String,%20boolean,%20android.graphics.drawable.Icon,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.service.controls.templates.ThumbnailTemplate.ThumbnailTemplate(java.lang.String, boolean, android.graphics.drawable.Icon, java.lang.CharSequence)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleRangeTemplate.xml b/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleRangeTemplate.xml
index f89043c457..1916224f77 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleRangeTemplate.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleRangeTemplate.xml
@@ -55,11 +55,22 @@
         <Parameter Name="range" Type="Android.Service.Controls.Templates.RangeTemplate" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="button">To be added.</param>
-        <param name="range">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="templateId">the identifier for this template.</param>
+        <param name="button">a <c>ControlButton</c> to use for the toggle interface</param>
+        <param name="range">a <c>RangeTemplate</c> to use for the range interface</param>
+        <summary>Constructs a new <c>ToggleRangeTemplate</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/templates/ToggleRangeTemplate#ToggleRangeTemplate(java.lang.String,%20android.service.controls.templates.ControlButton,%20android.service.controls.templates.RangeTemplate)" title="Reference documentation">Java documentation for <code>android.service.controls.templates.ToggleRangeTemplate.ToggleRangeTemplate(java.lang.String, android.service.controls.templates.ControlButton, android.service.controls.templates.RangeTemplate)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -85,12 +96,24 @@
         <Parameter Name="range" Type="Android.Service.Controls.Templates.RangeTemplate" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="checked">To be added.</param>
-        <param name="actionDescription">To be added.</param>
-        <param name="range">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="templateId">the identifier for this template.</param>
+        <param name="checked">true if the toggle should be rendered as active.</param>
+        <param name="actionDescription">action description for the button.</param>
+        <param name="range">
+          <c>RangeTemplate</c> to use for the range interface</param>
+        <summary>Constructs a new <c>ToggleRangeTemplate</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/templates/ToggleRangeTemplate#ToggleRangeTemplate(java.lang.String,%20boolean,%20java.lang.CharSequence,%20android.service.controls.templates.RangeTemplate)" title="Reference documentation">Java documentation for <code>android.service.controls.templates.ToggleRangeTemplate.ToggleRangeTemplate(java.lang.String, boolean, java.lang.CharSequence, android.service.controls.templates.RangeTemplate)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleTemplate.xml b/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleTemplate.xml
index dc8982c8d8..3eb5aae030 100644
--- a/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleTemplate.xml
+++ b/docs/Mono.Android/en/Android.Service.Controls.Templates/ToggleTemplate.xml
@@ -54,10 +54,21 @@
         <Parameter Name="button" Type="Android.Service.Controls.Templates.ControlButton" />
       </Parameters>
       <Docs>
-        <param name="templateId">To be added.</param>
-        <param name="button">To be added.</param>
+        <param name="templateId">the identifier for this template object</param>
+        <param name="button">a <c>ControlButton</c> that can show the current state and toggle it</param>
         <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/service/controls/templates/ToggleTemplate#ToggleTemplate(java.lang.String,%20android.service.controls.templates.ControlButton)" title="Reference documentation">Java documentation for <code>android.service.controls.templates.ToggleTemplate.ToggleTemplate(java.lang.String, android.service.controls.templates.ControlButton)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="ContentDescription">
diff --git a/docs/Mono.Android/en/Android.Service.Dreams/DreamService.xml b/docs/Mono.Android/en/Android.Service.Dreams/DreamService.xml
index 85efcab784..26b8201b13 100644
--- a/docs/Mono.Android/en/Android.Service.Dreams/DreamService.xml
+++ b/docs/Mono.Android/en/Android.Service.Dreams/DreamService.xml
@@ -1334,7 +1334,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/service/dreams/DreamService#onSearchRequested()" title="Reference documentation">Java documentation for <code>android.service.dreams.DreamService.onSearchRequested()</code>.</a>
+              <a href="https://developer.android.com/reference/android/service/dreams/DreamService#onSearchRequested(android.view.SearchEvent)" title="Reference documentation">Java documentation for <code>android.service.dreams.DreamService.onSearchRequested(android.view.SearchEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -1725,12 +1725,11 @@
       </Parameters>
       <Docs>
         <param name="view">To be added.</param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
-        <summary>Inflates a layout resource and set it to be the content view for this Dream.</summary>
+        <summary>Sets a view to be the content view for this Dream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/service/dreams/DreamService#setContentView(int)" title="Reference documentation">Java documentation for <code>android.service.dreams.DreamService.setContentView(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/service/dreams/DreamService#setContentView(android.view.View)" title="Reference documentation">Java documentation for <code>android.service.dreams.DreamService.setContentView(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -1812,7 +1811,6 @@
       <Docs>
         <param name="view">The desired content to display.</param>
         <param name="params">Layout parameters for the view.</param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
         <summary>Inflates a layout resource and set it to be the content view for this Dream.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Service.Media/MediaBrowserService.xml b/docs/Mono.Android/en/Android.Service.Media/MediaBrowserService.xml
index 361dd2f561..eba386a342 100644
--- a/docs/Mono.Android/en/Android.Service.Media/MediaBrowserService.xml
+++ b/docs/Mono.Android/en/Android.Service.Media/MediaBrowserService.xml
@@ -284,15 +284,17 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">To be added.</param>
         <param name="parentId">The id of the parent media item whose
-            children changed.</param>
+                       children changed.</param>
+        <param name="options">The bundle of service-specific arguments to send
+                       to the media browser. The contents of this bundle may
+                       contain the information about the change.</param>
         <summary>Notifies all connected media browsers that the children of
             the specified parent id have changed in some way.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/service/media/MediaBrowserService#notifyChildrenChanged(java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.media.MediaBrowserService.notifyChildrenChanged(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/service/media/MediaBrowserService#notifyChildrenChanged(java.lang.String,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.service.media.MediaBrowserService.notifyChildrenChanged(java.lang.String, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -452,10 +454,10 @@
         <Parameter Name="options" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="options">To be added.</param>
         <param name="parentId">The id of the parent media item whose children are to be
                        queried.</param>
         <param name="result">The Result to send the list of children to.</param>
+        <param name="options">To be added.</param>
         <summary>Called to get information about the children of a media item.</summary>
         <remarks>
           <para>
@@ -572,7 +574,6 @@
         <ReturnType>Android.Media.Session.MediaSession+Token</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="token">The token for the service's <c>MediaSession</c>.</param>
         <summary>Gets the session token, or null if it has not yet been created
             or if it has been destroyed. -or- Call to set the media session.</summary>
         <value>To be added.<list type="bullet"><item><term>The media session token, must not be null.
diff --git a/docs/Mono.Android/en/Android.Service.Notification/Condition.xml b/docs/Mono.Android/en/Android.Service.Notification/Condition.xml
index 04790bf24f..92890e8d59 100644
--- a/docs/Mono.Android/en/Android.Service.Notification/Condition.xml
+++ b/docs/Mono.Android/en/Android.Service.Notification/Condition.xml
@@ -68,8 +68,6 @@
       </Parameters>
       <Docs>
         <param name="source">To be added.</param>
-        <param name="id">the <c>android.app.AutomaticZenRule#getConditionId()</c> of the zen rule</param>
-        <param name="summary">a user visible description of the rule state.</param>
         <summary>An object representing the current state of a <c>android.app.AutomaticZenRule</c>.</summary>
         <remarks>
           <para>
@@ -172,13 +170,13 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="id">the <c>android.app.AutomaticZenRule#getConditionId()</c> of the zen rule</param>
+        <param name="summary">a user visible description of the rule state.</param>
         <param name="line1">To be added.</param>
         <param name="line2">To be added.</param>
         <param name="icon">To be added.</param>
         <param name="state">To be added.</param>
         <param name="flags">To be added.</param>
-        <param name="id">the <c>android.app.AutomaticZenRule#getConditionId()</c> of the zen rule</param>
-        <param name="summary">a user visible description of the rule state.</param>
         <summary>An object representing the current state of a <c>android.app.AutomaticZenRule</c>.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService.xml b/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService.xml
index fd036e005a..2cc48fa738 100644
--- a/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService.xml
+++ b/docs/Mono.Android/en/Android.Service.Notification/NotificationListenerService.xml
@@ -182,16 +182,15 @@
       <Docs>
         <param name="pkg">Package of the notifying app.</param>
         <param name="tag">Tag of the notification as specified by the notifying app in
-     <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='M:Android App NotificationManager Notify(System String,System Int32,System Int32)';scope=Xamarin" title="M:Android.App.NotificationManager.Notify(System.String,System.Int32,System.Int32)">M:Android.App.NotificationManager.Notify(System.String,System.Int32,System.Int32)</a></format>.</param>
+                <c>android.app.NotificationManager#notify(String, int, android.app.Notification)</c>.</param>
         <param name="id">ID of the notification as specified by the notifying app in
-     <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='M:Android App NotificationManager Notify(System String,System Int32,System Int32)';scope=Xamarin" title="M:Android.App.NotificationManager.Notify(System.String,System.Int32,System.Int32)">M:Android.App.NotificationManager.Notify(System.String,System.Int32,System.Int32)</a></format>.
- <para tool="javadoc-to-mdoc" /></param>
-        <param name="key">Notification to dismiss from <c>StatusBarNotification#getKey()</c>.</param>
+                <c>android.app.NotificationManager#notify(String, int, android.app.Notification)</c>.
+            &lt;p&gt;</param>
         <summary>Inform the notification manager about dismissal of a single notification.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/service/notification/NotificationListenerService#cancelNotification(java.lang.String)" title="Reference documentation">Java documentation for <code>android.service.notification.NotificationListenerService.cancelNotification(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/service/notification/NotificationListenerService#cancelNotification(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.service.notification.NotificationListenerService.cancelNotification(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -606,13 +605,13 @@
       </Parameters>
       <Docs>
         <param name="keys">the keys of the notifications to request</param>
-        <summary>Request the list of outstanding notifications (that is, those that are visible to the
-            current user).</summary>
-        <returns>An array of active notifications, sorted in natural order.</returns>
+        <summary>Request one or more notifications by key.</summary>
+        <returns>An array of notifications corresponding to the requested keys, in the
+            same order as the key list.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/service/notification/NotificationListenerService#getActiveNotifications()" title="Reference documentation">Java documentation for <code>android.service.notification.NotificationListenerService.getActiveNotifications()</code>.</a>
+              <a href="https://developer.android.com/reference/android/service/notification/NotificationListenerService#getActiveNotifications(java.lang.String[])" title="Reference documentation">Java documentation for <code>android.service.notification.NotificationListenerService.getActiveNotifications(java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1285,12 +1284,12 @@
         <Parameter Name="rankingMap" Type="Android.Service.Notification.NotificationListenerService+RankingMap" />
       </Parameters>
       <Docs>
-        <param name="rankingMap">The current ranking map that can be used to retrieve ranking information
-                   for active notifications, including the newly posted one.
-</param>
         <param name="sbn">A data structure encapsulating the original <c>android.app.Notification</c>
                        object as well as its identifying information (tag and id) and source
                        (package name).</param>
+        <param name="rankingMap">The current ranking map that can be used to retrieve ranking information
+                   for active notifications, including the newly posted one.
+</param>
         <summary>Implement this method to learn about new notifications as they are posted by apps.</summary>
         <remarks>
           <para>
@@ -1412,13 +1411,13 @@
         <Parameter Name="rankingMap" Type="Android.Service.Notification.NotificationListenerService+RankingMap" />
       </Parameters>
       <Docs>
+        <param name="sbn">A data structure encapsulating at least the original information (tag and id)
+                       and source (package name) used to post the <c>android.app.Notification</c> that
+                       was just removed.</param>
         <param name="rankingMap">The current ranking map that can be used to retrieve ranking information
                    for active notifications.
 
 </param>
-        <param name="sbn">A data structure encapsulating at least the original information (tag and id)
-                       and source (package name) used to post the <c>android.app.Notification</c> that
-                       was just removed.</param>
         <summary>Implement this method to learn when notifications are removed.</summary>
         <remarks>
           <para>
@@ -1466,11 +1465,11 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="rankingMap">To be added.</param>
-        <param name="reason">To be added.</param>
         <param name="sbn">A data structure encapsulating at least the original information (tag and id)
                        and source (package name) used to post the <c>android.app.Notification</c> that
                        was just removed.</param>
+        <param name="rankingMap">To be added.</param>
+        <param name="reason">To be added.</param>
         <summary>Implement this method to learn when notifications are removed.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Service.Voice/AlwaysOnHotwordDetector.xml b/docs/Mono.Android/en/Android.Service.Voice/AlwaysOnHotwordDetector.xml
index b37f2bf9e4..04a6f8094c 100644
--- a/docs/Mono.Android/en/Android.Service.Voice/AlwaysOnHotwordDetector.xml
+++ b/docs/Mono.Android/en/Android.Service.Voice/AlwaysOnHotwordDetector.xml
@@ -587,11 +587,11 @@
       <Docs>
         <param name="recognitionFlags">The flags to control the recognition properties.</param>
         <summary>Starts recognition for the associated keyphrase.</summary>
-        <returns>To be added.</returns>
+        <returns>Indicates whether the call succeeded or not.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/service/voice/AlwaysOnHotwordDetector#startRecognition()" title="Reference documentation">Java documentation for <code>android.service.voice.AlwaysOnHotwordDetector.startRecognition()</code>.</a>
+              <a href="https://developer.android.com/reference/android/service/voice/AlwaysOnHotwordDetector#startRecognition(int)" title="Reference documentation">Java documentation for <code>android.service.voice.AlwaysOnHotwordDetector.startRecognition(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Service.Voice/VoiceInteractionSession.xml b/docs/Mono.Android/en/Android.Service.Voice/VoiceInteractionSession.xml
index c22659b370..316ea987c5 100644
--- a/docs/Mono.Android/en/Android.Service.Voice/VoiceInteractionSession.xml
+++ b/docs/Mono.Android/en/Android.Service.Voice/VoiceInteractionSession.xml
@@ -919,18 +919,6 @@
       </Parameters>
       <Docs>
         <param name="state">To be added.</param>
-        <param name="data">Arbitrary data supplied by the app through
-            <c>android.app.Activity#onProvideAssistData Activity.onProvideAssistData</c>.
-            May be null if assist data has been disabled by the user or device policy.</param>
-        <param name="structure">If available, the structure definition of all windows currently
-            displayed by the app.  May be null if assist data has been disabled by the user
-            or device policy; will be an empty stub if the application has disabled assist
-            by marking its window as secure.</param>
-        <param name="content">Additional content data supplied by the app through
-            <c>android.app.Activity#onProvideAssistContent Activity.onProvideAssistContent</c>.
-            May be null if assist data has been disabled by the user or device policy; will
-            not be automatically filled in with data from the app if the app has marked its
-            window as secure.</param>
         <summary>Called to receive data from the application that the user was currently viewing when
             -     * an assist session is started.</summary>
         <remarks>
@@ -1894,9 +1882,9 @@
       </Parameters>
       <Docs>
         <param name="activityId">Ths activity id of the app to get the actions from.</param>
-        <param name="resultExecutor">The handler to receive the callback</param>
         <param name="cancellationSignal">A signal to cancel the operation in progress,
                 or <c>null</c> if none.</param>
+        <param name="resultExecutor">The handler to receive the callback</param>
         <param name="callback">The callback to receive the response</param>
         <summary>Requests a list of supported actions from an app.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Speech.Tts/ISynthesisCallback.xml b/docs/Mono.Android/en/Android.Speech.Tts/ISynthesisCallback.xml
index e8725839f1..0a0308edc5 100644
--- a/docs/Mono.Android/en/Android.Speech.Tts/ISynthesisCallback.xml
+++ b/docs/Mono.Android/en/Android.Speech.Tts/ISynthesisCallback.xml
@@ -208,13 +208,12 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="errorCode">Error code to pass to the client. One of the ERROR_ values from
-      <see cref="T:Android.Speech.Tts.TextToSpeech" /></param>
+        <param name="errorCode">Error code to pass to the client. One of the ERROR_ values from <c>android.speech.tts.TextToSpeech</c></param>
         <summary>The service should call this method if the speech synthesis fails.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/SynthesisCallback#error()" title="Reference documentation">Java documentation for <code>android.speech.tts.SynthesisCallback.error()</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/SynthesisCallback#error(int)" title="Reference documentation">Java documentation for <code>android.speech.tts.SynthesisCallback.error(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml b/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml
index 8367d2ec29..5d59ef7a12 100644
--- a/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml
+++ b/docs/Mono.Android/en/Android.Speech.Tts/TextToSpeech.xml
@@ -120,11 +120,11 @@
         <Parameter Name="engine" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="engine">To be added.</param>
         <param name="context">The context this instance is running in.</param>
         <param name="listener">The <c>TextToSpeech.OnInitListener</c> that will be called when the
                        TextToSpeech engine has initialized. In a case of a failure the listener
                        may be called immediately, before TextToSpeech instance is fully constructed.</param>
+        <param name="engine">To be added.</param>
         <summary>The constructor for the TextToSpeech class, using the default TTS engine.</summary>
         <remarks>
           <para>
@@ -257,16 +257,15 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="file">File object pointing to the sound file.</param>
         <param name="earcon">The name of the earcon.
                        Example: &lt;code&gt;"[tick]"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
+        <param name="file">File object pointing to the sound file.</param>
         <summary>Adds a mapping between a string of text and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addEarcon(java.lang.String,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addEarcon(java.lang.String, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addEarcon(java.lang.String,%20java.io.File)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addEarcon(java.lang.String, java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -311,17 +310,16 @@
         <Parameter Name="filename" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="filename">The full path to the sound file (for example:
-            "/sdcard/mysounds/tick.wav")</param>
         <param name="earcon">The name of the earcon.
                        Example: &lt;code&gt;"[tick]"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
+        <param name="filename">The full path to the sound file (for example:
+                       "/sdcard/mysounds/tick.wav")</param>
         <summary>Adds a mapping between a string of text and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addEarcon(java.lang.String,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addEarcon(java.lang.String, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addEarcon(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addEarcon(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -364,22 +362,25 @@
         <Parameter Name="resourceId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="packagename">the package name of the application that contains the
-            resource. This can for instance be the package name of your own application.
-            Example: <format type="text/html"><b>"com.google.marvin.compass"</b></format><format type="text/html"><br /></format>
-            The package name can be found in the AndroidManifest.xml of
-            the application containing the resource.
-            <para tool="javadoc-to-mdoc"><format type="text/html"><b>com.google.marvin.compass</b></format></para></param>
-        <param name="resourceId">Example: <c>R.raw.tick_snd</c></param>
         <param name="earcon">The name of the earcon.
-                       Example: &lt;code&gt;"[tick]"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
-        <summary>Adds a mapping between a string of text and a sound file.</summary>
+                       Example: &lt;code&gt;"[tick]"&lt;/code&gt;&lt;br/&gt;</param>
+        <param name="packagename">the package name of the application that contains the
+                       resource. This can for instance be the package name of your own application.
+                       Example: &lt;b&gt;"com.google.marvin.compass"&lt;/b&gt;&lt;br/&gt;
+                       The package name can be found in the AndroidManifest.xml of
+                       the application containing the resource.
+                       &lt;p&gt;
+                       &lt;code&gt;&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
+                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;&lt;/code&gt;
+                       &lt;/p&gt;</param>
+        <param name="resourceId">Example: &lt;code&gt;R.raw.tick_snd&lt;/code&gt;</param>
+        <summary>Adds a mapping between a string of text and a sound resource in a
+            package.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addEarcon(java.lang.String,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addEarcon(java.lang.String, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addEarcon(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addEarcon(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -469,15 +470,14 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="file">File object pointing to the sound file.</param>
         <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
+        <param name="file">File object pointing to the sound file.</param>
         <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20java.io.File)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -542,15 +542,14 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
         <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
+        <param name="file">File object pointing to the sound file.</param>
         <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20java.io.File)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -591,16 +590,15 @@
         <Parameter Name="filename" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="filename">The full path to the sound file (for example:
-            "/sdcard/mysounds/hello.wav")</param>
         <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
-        <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
+        <param name="filename">The full path to the sound file (for example:
+                       "/sdcard/mysounds/hello.wav")</param>
+        <summary>Adds a mapping between a string of text and a sound file.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -643,23 +641,26 @@
         <Parameter Name="resourceId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="packagename">Pass the packagename of the application that contains the
-            resource. If the resource is in your own application (this is
-            the most common case), then put the packagename of your
-            application here.<format type="text/html"><br /></format>
-            Example: <format type="text/html"><b>"com.google.marvin.compass"</b></format><format type="text/html"><br /></format>
-            The packagename can be found in the AndroidManifest.xml of
-            your application.
-            <para tool="javadoc-to-mdoc"><format type="text/html"><b>com.google.marvin.compass</b></format></para></param>
-        <param name="resourceId">Example: <c>R.raw.south_south_east</c></param>
         <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
-        <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
+        <param name="packagename">Pass the packagename of the application that contains the
+                       resource. If the resource is in your own application (this is
+                       the most common case), then put the packagename of your
+                       application here.&lt;br/&gt;
+                       Example: &lt;b&gt;"com.google.marvin.compass"&lt;/b&gt;&lt;br/&gt;
+                       The packagename can be found in the AndroidManifest.xml of
+                       your application.
+                       &lt;p&gt;
+                       &lt;code&gt;&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
+                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;&lt;/code&gt;
+                       &lt;/p&gt;</param>
+        <param name="resourceId">Example: &lt;code&gt;R.raw.south_south_east&lt;/code&gt;</param>
+        <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) of text
+            and a sound resource in a package.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -701,23 +702,26 @@
         <Parameter Name="resourceId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="packagename">Pass the packagename of the application that contains the
-            resource. If the resource is in your own application (this is
-            the most common case), then put the packagename of your
-            application here.<format type="text/html"><br /></format>
-            Example: <format type="text/html"><b>"com.google.marvin.compass"</b></format><format type="text/html"><br /></format>
-            The packagename can be found in the AndroidManifest.xml of
-            your application.
-            <para tool="javadoc-to-mdoc"><format type="text/html"><b>com.google.marvin.compass</b></format></para></param>
-        <param name="resourceId">Example: <c>R.raw.south_south_east</c></param>
         <param name="text">The string of text. Example: &lt;code&gt;"south_south_east"&lt;/code&gt;</param>
-        <param name="uri">Uri object pointing to the sound file.</param>
-        <summary>Adds a mapping between a CharSequence (may be spanned with TtsSpans) and a sound file.</summary>
+        <param name="packagename">Pass the packagename of the application that contains the
+                       resource. If the resource is in your own application (this is
+                       the most common case), then put the packagename of your
+                       application here.&lt;br/&gt;
+                       Example: &lt;b&gt;"com.google.marvin.compass"&lt;/b&gt;&lt;br/&gt;
+                       The packagename can be found in the AndroidManifest.xml of
+                       your application.
+                       &lt;p&gt;
+                       &lt;code&gt;&amp;lt;manifest xmlns:android=&amp;quot;...&amp;quot;
+                 package=&amp;quot;&lt;b&gt;com.google.marvin.compass&lt;/b&gt;&amp;quot;&amp;gt;&lt;/code&gt;
+                       &lt;/p&gt;</param>
+        <param name="resourceId">Example: &lt;code&gt;R.raw.south_south_east&lt;/code&gt;</param>
+        <summary>Adds a mapping between a string of text and a sound resource in a
+            package.</summary>
         <returns>Code indicating success or failure. See <c>#ERROR</c> and <c>#SUCCESS</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.CharSequence,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.CharSequence, android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#addSpeech(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.addSpeech(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1256,6 +1260,7 @@
         <param name="params">Parameters for the request. Can be null.
                        Supported parameter names:
                        <c>Engine#KEY_PARAM_STREAM</c>,
+                       <c>Engine#KEY_PARAM_UTTERANCE_ID</c>.
                        Engine specific parameters may be passed in but the parameter keys
                        must be prefixed by the name of the engine they are intended for. For example
                        the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the
@@ -1266,7 +1271,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#playEarcon(java.lang.String,%20int,%20android.os.Bundle,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.playEarcon(java.lang.String, int, android.os.Bundle, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#playEarcon(java.lang.String,%20int,%20java.util.HashMap)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.playEarcon(java.lang.String, int, java.util.HashMap)</code>.</a>
             </format>
           </para>
           <para>
@@ -1958,21 +1963,20 @@
         <param name="params">Parameters for the request. Can be null.
                        Supported parameter names:
                        <c>Engine#KEY_PARAM_STREAM</c>,
+                       <c>Engine#KEY_PARAM_UTTERANCE_ID</c>,
                        <c>Engine#KEY_PARAM_VOLUME</c>,
                        <c>Engine#KEY_PARAM_PAN</c>.
                        Engine specific parameters may be passed in but the parameter keys
                        must be prefixed by the name of the engine they are intended for. For example
                        the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the
                        engine named "com.svox.pico" if it is being used.</param>
-        <param name="utteranceId">An unique identifier for this request.</param>
-        <summary>Speaks the text using the specified queuing strategy and speech parameters, the text may
-            be spanned with TtsSpans.</summary>
+        <summary>Speaks the string using the specified queuing strategy and speech parameters.</summary>
         <returns>
           <c>#ERROR</c> or <c>#SUCCESS</c> of &lt;b&gt;queuing&lt;/b&gt; the speak operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#speak(java.lang.CharSequence,%20int,%20android.os.Bundle,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.speak(java.lang.CharSequence, int, android.os.Bundle, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#speak(java.lang.String,%20int,%20java.util.HashMap)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.speak(java.lang.String, int, java.util.HashMap)</code>.</a>
             </format>
           </para>
           <para>
@@ -2192,23 +2196,24 @@
         <Parameter Name="filename" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="filename">To be added.</param>
         <param name="text">The text that should be synthesized. No longer than
                        <c>#getMaxSpeechInputLength()</c> characters.</param>
-        <param name="params">Parameters for the request.
+        <param name="params">Parameters for the request. Cannot be null.
+                       Supported parameter names:
+                       <c>Engine#KEY_PARAM_UTTERANCE_ID</c>.
                        Engine specific parameters may be passed in but the parameter keys
                        must be prefixed by the name of the engine they are intended for. For example
-                       the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the engine
-                       named "com.svox.pico" if it is being used.</param>
-        <param name="fileDescriptor">ParcelFileDescriptor to write the generated audio data to.</param>
-        <param name="utteranceId">An unique identifier for this request.</param>
-        <summary>Synthesizes the given text to a ParcelFileDescriptor using the specified parameters.</summary>
+                       the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the
+                       engine named "com.svox.pico" if it is being used.</param>
+        <param name="filename">Absolute file filename to write the generated audio data to.It should be
+                       something like "/sdcard/myappsounds/mysound.wav".</param>
+        <summary>Synthesizes the given text to a file using the specified parameters.</summary>
         <returns>
           <c>#ERROR</c> or <c>#SUCCESS</c> of &lt;b&gt;queuing&lt;/b&gt; the synthesizeToFile operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#synthesizeToFile(java.lang.CharSequence,%20android.os.Bundle,%20android.os.ParcelFileDescriptor,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.synthesizeToFile(java.lang.CharSequence, android.os.Bundle, android.os.ParcelFileDescriptor, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#synthesizeToFile(java.lang.String,%20java.util.HashMap,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.synthesizeToFile(java.lang.String, java.util.HashMap, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2309,23 +2314,22 @@
         <Parameter Name="utteranceId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="file">File to write the generated audio data to.</param>
         <param name="text">The text that should be synthesized. No longer than
                        <c>#getMaxSpeechInputLength()</c> characters.</param>
-        <param name="params">Parameters for the request.
+        <param name="params">Parameters for the request. Cannot be null.
                        Engine specific parameters may be passed in but the parameter keys
                        must be prefixed by the name of the engine they are intended for. For example
-                       the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the engine
-                       named "com.svox.pico" if it is being used.</param>
-        <param name="fileDescriptor">ParcelFileDescriptor to write the generated audio data to.</param>
+                       the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the
+                       engine named "com.svox.pico" if it is being used.</param>
+        <param name="file">File to write the generated audio data to.</param>
         <param name="utteranceId">An unique identifier for this request.</param>
-        <summary>Synthesizes the given text to a ParcelFileDescriptor using the specified parameters.</summary>
+        <summary>Synthesizes the given text to a file using the specified parameters.</summary>
         <returns>
           <c>#ERROR</c> or <c>#SUCCESS</c> of &lt;b&gt;queuing&lt;/b&gt; the synthesizeToFile operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#synthesizeToFile(java.lang.CharSequence,%20android.os.Bundle,%20android.os.ParcelFileDescriptor,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.synthesizeToFile(java.lang.CharSequence, android.os.Bundle, android.os.ParcelFileDescriptor, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#synthesizeToFile(java.lang.CharSequence,%20android.os.Bundle,%20java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.synthesizeToFile(java.lang.CharSequence, android.os.Bundle, java.io.File, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2402,23 +2406,22 @@
         <Parameter Name="utteranceId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
         <param name="text">The text that should be synthesized. No longer than
                        <c>#getMaxSpeechInputLength()</c> characters.</param>
-        <param name="params">Parameters for the request.
+        <param name="params">Parameters for the request. Cannot be null.
                        Engine specific parameters may be passed in but the parameter keys
                        must be prefixed by the name of the engine they are intended for. For example
-                       the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the engine
-                       named "com.svox.pico" if it is being used.</param>
-        <param name="fileDescriptor">ParcelFileDescriptor to write the generated audio data to.</param>
+                       the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the
+                       engine named "com.svox.pico" if it is being used.</param>
+        <param name="file">File to write the generated audio data to.</param>
         <param name="utteranceId">An unique identifier for this request.</param>
-        <summary>Synthesizes the given text to a ParcelFileDescriptor using the specified parameters.</summary>
+        <summary>Synthesizes the given text to a file using the specified parameters.</summary>
         <returns>
           <c>#ERROR</c> or <c>#SUCCESS</c> of &lt;b&gt;queuing&lt;/b&gt; the synthesizeToFile operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#synthesizeToFile(java.lang.CharSequence,%20android.os.Bundle,%20android.os.ParcelFileDescriptor,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.synthesizeToFile(java.lang.CharSequence, android.os.Bundle, android.os.ParcelFileDescriptor, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/TextToSpeech#synthesizeToFile(java.lang.CharSequence,%20android.os.Bundle,%20java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.TextToSpeech.synthesizeToFile(java.lang.CharSequence, android.os.Bundle, java.io.File, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Speech.Tts/UtteranceProgressListener.xml b/docs/Mono.Android/en/Android.Speech.Tts/UtteranceProgressListener.xml
index 859d437843..db8ea170aa 100644
--- a/docs/Mono.Android/en/Android.Speech.Tts/UtteranceProgressListener.xml
+++ b/docs/Mono.Android/en/Android.Speech.Tts/UtteranceProgressListener.xml
@@ -310,13 +310,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="errorCode">one of the ERROR_* codes from <see cref="T:Android.Speech.Tts.TextToSpeech" /></param>
         <param name="utteranceId">The utterance ID of the utterance.</param>
+        <param name="errorCode">one of the ERROR_* codes from <c>TextToSpeech</c></param>
         <summary>Called when an error has occurred during processing.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener#onError(java.lang.String)" title="Reference documentation">Java documentation for <code>android.speech.tts.UtteranceProgressListener.onError(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener#onError(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.speech.tts.UtteranceProgressListener.onError(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Speech/SpeechRecognizer.xml b/docs/Mono.Android/en/Android.Speech/SpeechRecognizer.xml
index 8b57f5dbfe..946c39657b 100644
--- a/docs/Mono.Android/en/Android.Speech/SpeechRecognizer.xml
+++ b/docs/Mono.Android/en/Android.Speech/SpeechRecognizer.xml
@@ -277,15 +277,15 @@
         <Parameter Name="serviceComponent" Type="Android.Content.ComponentName" />
       </Parameters>
       <Docs>
-        <param name="serviceComponent">the <see cref="T:Android.Content.ComponentName" /> of a specific service to direct this
-        <c>SpeechRecognizer</c> to</param>
         <param name="context">in which to create <c>SpeechRecognizer</c></param>
+        <param name="serviceComponent">the <c>ComponentName</c> of a specific service to direct this
+                   <c>SpeechRecognizer</c> to</param>
         <summary>Factory method to create a new <c>SpeechRecognizer</c>.</summary>
         <returns>a new <c>SpeechRecognizer</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/speech/SpeechRecognizer#createSpeechRecognizer(android.content.Context)" title="Reference documentation">Java documentation for <code>android.speech.SpeechRecognizer.createSpeechRecognizer(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/speech/SpeechRecognizer#createSpeechRecognizer(android.content.Context,%20android.content.ComponentName)" title="Reference documentation">Java documentation for <code>android.speech.SpeechRecognizer.createSpeechRecognizer(android.content.Context, android.content.ComponentName)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Systems/ErrnoException.xml b/docs/Mono.Android/en/Android.Systems/ErrnoException.xml
index 13c547ec79..6a5013d242 100644
--- a/docs/Mono.Android/en/Android.Systems/ErrnoException.xml
+++ b/docs/Mono.Android/en/Android.Systems/ErrnoException.xml
@@ -96,11 +96,11 @@
         <param name="functionName">To be added.</param>
         <param name="errno">To be added.</param>
         <param name="cause">To be added.</param>
-        <summary>Constructs an instance with the given function name and errno value.</summary>
+        <summary>Constructs an instance with the given function name, errno value, and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/ErrnoException#ErrnoException(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.system.ErrnoException.ErrnoException(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/ErrnoException#ErrnoException(java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>android.system.ErrnoException.ErrnoException(java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Systems/Os.xml b/docs/Mono.Android/en/Android.Systems/Os.xml
index ca2e6163ab..a47594e0d8 100644
--- a/docs/Mono.Android/en/Android.Systems/Os.xml
+++ b/docs/Mono.Android/en/Android.Systems/Os.xml
@@ -151,7 +151,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#bind(java.io.FileDescriptor,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.system.Os.bind(java.io.FileDescriptor, java.net.InetAddress, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#bind(java.io.FileDescriptor,%20java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>android.system.Os.bind(java.io.FileDescriptor, java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -363,7 +363,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#connect(java.io.FileDescriptor,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.system.Os.connect(java.io.FileDescriptor, java.net.InetAddress, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#connect(java.io.FileDescriptor,%20java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>android.system.Os.connect(java.io.FileDescriptor, java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -2649,7 +2649,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#pread(java.io.FileDescriptor,%20java.nio.ByteBuffer,%20long)" title="Reference documentation">Java documentation for <code>android.system.Os.pread(java.io.FileDescriptor, java.nio.ByteBuffer, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#pread(java.io.FileDescriptor,%20byte[],%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.system.Os.pread(java.io.FileDescriptor, byte[], int, int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2745,7 +2745,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#pwrite(java.io.FileDescriptor,%20java.nio.ByteBuffer,%20long)" title="Reference documentation">Java documentation for <code>android.system.Os.pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#pwrite(java.io.FileDescriptor,%20byte[],%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>android.system.Os.pwrite(java.io.FileDescriptor, byte[], int, int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2837,7 +2837,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#read(java.io.FileDescriptor,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>android.system.Os.read(java.io.FileDescriptor, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#read(java.io.FileDescriptor,%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.system.Os.read(java.io.FileDescriptor, byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3026,7 +3026,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#recvfrom(java.io.FileDescriptor,%20java.nio.ByteBuffer,%20int,%20java.net.InetSocketAddress)" title="Reference documentation">Java documentation for <code>android.system.Os.recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#recvfrom(java.io.FileDescriptor,%20byte[],%20int,%20int,%20int,%20java.net.InetSocketAddress)" title="Reference documentation">Java documentation for <code>android.system.Os.recvfrom(java.io.FileDescriptor, byte[], int, int, int, java.net.InetSocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -3432,7 +3432,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#sendto(java.io.FileDescriptor,%20java.nio.ByteBuffer,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.system.Os.sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#sendto(java.io.FileDescriptor,%20byte[],%20int,%20int,%20int,%20java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>android.system.Os.sendto(java.io.FileDescriptor, byte[], int, int, int, java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -3484,7 +3484,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#sendto(java.io.FileDescriptor,%20java.nio.ByteBuffer,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.system.Os.sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#sendto(java.io.FileDescriptor,%20byte[],%20int,%20int,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>android.system.Os.sendto(java.io.FileDescriptor, byte[], int, int, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4654,7 +4654,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/Os#write(java.io.FileDescriptor,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>android.system.Os.write(java.io.FileDescriptor, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/Os#write(java.io.FileDescriptor,%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.system.Os.write(java.io.FileDescriptor, byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Systems/StructStat.xml b/docs/Mono.Android/en/Android.Systems/StructStat.xml
index f9808fd499..fc00bc5c93 100644
--- a/docs/Mono.Android/en/Android.Systems/StructStat.xml
+++ b/docs/Mono.Android/en/Android.Systems/StructStat.xml
@@ -82,7 +82,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/system/StructStat#StructStat(long,%20long,%20int,%20long,%20int,%20int,%20long,%20long,%20long,%20long,%20long,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.system.StructStat.StructStat(long, long, int, long, int, int, long, long, long, long, long, long, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/system/StructStat#StructStat(long,%20long,%20int,%20long,%20int,%20int,%20long,%20long,%20android.system.StructTimespec,%20android.system.StructTimespec,%20android.system.StructTimespec,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.system.StructStat.StructStat(long, long, int, long, int, int, long, long, android.system.StructTimespec, android.system.StructTimespec, android.system.StructTimespec, long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/Call.xml b/docs/Mono.Android/en/Android.Telecom/Call.xml
index a95320100f..5f65a53670 100644
--- a/docs/Mono.Android/en/Android.Telecom/Call.xml
+++ b/docs/Mono.Android/en/Android.Telecom/Call.xml
@@ -1236,8 +1236,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">A <c>Callback</c>.</param>
+        <param name="handler">To be added.</param>
         <summary>Registers a callback to this <c>Call</c>.</summary>
         <remarks>
           <para>
@@ -1324,15 +1324,13 @@
         <Parameter Name="textMessage" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="rejectWithMessage">To be added.</param>
-        <param name="textMessage">To be added.</param>
-        <param name="rejectReason">the reason the call is being rejected.</param>
-        <summary>Instructs the <c>ConnectionService</c> providing this <c>#STATE_RINGING</c> call that the
-            user has chosen to reject the call and has indicated a reason why the call is being rejected.</summary>
+        <param name="rejectWithMessage">Whether to reject with a text message.</param>
+        <param name="textMessage">An optional text message with which to respond.</param>
+        <summary>Instructs this <c>#STATE_RINGING</c><c>Call</c> to reject.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Call#reject(int)" title="Reference documentation">Java documentation for <code>android.telecom.Call.reject(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Call#reject(boolean,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.Call.reject(boolean, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1490,7 +1488,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Call#removeExtras(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.Call.removeExtras(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Call#removeExtras(java.util.List)" title="Reference documentation">Java documentation for <code>android.telecom.Call.removeExtras(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/CallAudioState.xml b/docs/Mono.Android/en/Android.Telecom/CallAudioState.xml
index 92f4283355..9e87f79986 100644
--- a/docs/Mono.Android/en/Android.Telecom/CallAudioState.xml
+++ b/docs/Mono.Android/en/Android.Telecom/CallAudioState.xml
@@ -83,12 +83,26 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="muted">To be added.</param>
-        <param name="route">To be added.</param>
-        <param name="supportedRouteMask">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="muted">
+          <c>true</c> if the call is muted, <c>false</c> otherwise.</param>
+        <param name="route">The current audio route being used.
+            Allowed values:
+            <c>#ROUTE_EARPIECE</c><c>#ROUTE_BLUETOOTH</c><c>#ROUTE_WIRED_HEADSET</c><c>#ROUTE_SPEAKER</c></param>
+        <param name="supportedRouteMask">Bit mask of all routes supported by this call. This should be a
+            bitwise combination of the following values:
+            <c>#ROUTE_EARPIECE</c><c>#ROUTE_BLUETOOTH</c><c>#ROUTE_WIRED_HEADSET</c><c>#ROUTE_SPEAKER</c></param>
+        <summary>Constructor for a <c>CallAudioState</c> object.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telecom/CallAudioState#CallAudioState(boolean,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.telecom.CallAudioState.CallAudioState(boolean, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.Telecom/Conference.xml b/docs/Mono.Android/en/Android.Telecom/Conference.xml
index 9f9b96aff3..c6726f846b 100644
--- a/docs/Mono.Android/en/Android.Telecom/Conference.xml
+++ b/docs/Mono.Android/en/Android.Telecom/Conference.xml
@@ -724,9 +724,21 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="videoState">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="videoState">The video state in which to answer the connection.</param>
+        <summary>Notifies this Conference, which is in <c>STATE_RINGING</c>, of
+            a request to accept.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telecom/Conference#onAnswer(int)" title="Reference documentation">Java documentation for <code>android.telecom.Conference.onAnswer(int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="OnCallAudioStateChanged">
@@ -980,12 +992,13 @@
         <Parameter Name="connection" Type="Android.Telecom.Connection" />
       </Parameters>
       <Docs>
-        <param name="connection">To be added.</param>
-        <summary>Notifies the <c>Conference</c> when the child calls should be merged.</summary>
+        <param name="connection">The <c>Connection</c> to merge.</param>
+        <summary>Notifies the <c>Conference</c> when the specified <c>Connection</c> should merged with the
+            conference call.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Conference#onMerge()" title="Reference documentation">Java documentation for <code>android.telecom.Conference.onMerge()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Conference#onMerge(android.telecom.Connection)" title="Reference documentation">Java documentation for <code>android.telecom.Conference.onMerge(android.telecom.Connection)</code>.</a>
             </format>
           </para>
           <para>
@@ -1362,7 +1375,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Conference#removeExtras(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.Conference.removeExtras(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Conference#removeExtras(java.util.List)" title="Reference documentation">Java documentation for <code>android.telecom.Conference.removeExtras(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/Connection.xml b/docs/Mono.Android/en/Android.Telecom/Connection.xml
index 65addcf0e4..6a43139e26 100644
--- a/docs/Mono.Android/en/Android.Telecom/Connection.xml
+++ b/docs/Mono.Android/en/Android.Telecom/Connection.xml
@@ -2699,13 +2699,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="videoState">To be added.</param>
+        <param name="videoState">The video state in which to answer the connection.</param>
         <summary>Notifies this Connection, which is in <c>#STATE_RINGING</c>, of
             a request to accept.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Connection#onAnswer()" title="Reference documentation">Java documentation for <code>android.telecom.Connection.onAnswer()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Connection#onAnswer(int)" title="Reference documentation">Java documentation for <code>android.telecom.Connection.onAnswer(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3166,13 +3166,12 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="rejectReason">To be added.</param>
-        <summary>Notifies this Connection, which is in <c>#STATE_RINGING</c>, of
-            a request to reject.</summary>
+        <param name="rejectReason">the reason the user provided for rejecting the call.</param>
+        <summary>Notifies this Connection, which is in <c>#STATE_RINGING</c>, of a request to reject.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Connection#onReject()" title="Reference documentation">Java documentation for <code>android.telecom.Connection.onReject()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Connection#onReject(int)" title="Reference documentation">Java documentation for <code>android.telecom.Connection.onReject(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3208,11 +3207,11 @@
       <Docs>
         <param name="replyMessage">To be added.</param>
         <summary>Notifies this Connection, which is in <c>#STATE_RINGING</c>, of
-            a request to reject.</summary>
+            a request to reject with a message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Connection#onReject()" title="Reference documentation">Java documentation for <code>android.telecom.Connection.onReject()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Connection#onReject(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.Connection.onReject(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -4120,7 +4119,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/Connection#removeExtras(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.Connection.removeExtras(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/Connection#removeExtras(java.util.List)" title="Reference documentation">Java documentation for <code>android.telecom.Connection.removeExtras(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/ConnectionRequest.xml b/docs/Mono.Android/en/Android.Telecom/ConnectionRequest.xml
index 3c42511be1..092579bbb7 100644
--- a/docs/Mono.Android/en/Android.Telecom/ConnectionRequest.xml
+++ b/docs/Mono.Android/en/Android.Telecom/ConnectionRequest.xml
@@ -117,15 +117,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="videoState">To be added.</param>
         <param name="accountHandle">The accountHandle which should be used to place the call.</param>
         <param name="handle">The handle (e.g., phone number) to which the <c>Connection</c> is to connect.</param>
         <param name="extras">Application-specific extra data.</param>
+        <param name="videoState">Determines the video state for the connection.</param>
         <summary>To be added.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/ConnectionRequest#ConnectionRequest(android.telecom.PhoneAccountHandle,%20android.net.Uri,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.telecom.ConnectionRequest.ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/ConnectionRequest#ConnectionRequest(android.telecom.PhoneAccountHandle,%20android.net.Uri,%20android.os.Bundle,%20int)" title="Reference documentation">Java documentation for <code>android.telecom.ConnectionRequest.ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/DisconnectCause.xml b/docs/Mono.Android/en/Android.Telecom/DisconnectCause.xml
index 676593766b..cc210c7345 100644
--- a/docs/Mono.Android/en/Android.Telecom/DisconnectCause.xml
+++ b/docs/Mono.Android/en/Android.Telecom/DisconnectCause.xml
@@ -117,13 +117,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
         <param name="code">The code for the disconnect cause.</param>
+        <param name="reason">The reason for the disconnect.</param>
         <summary>Creates a new DisconnectCause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/DisconnectCause#DisconnectCause(int)" title="Reference documentation">Java documentation for <code>android.telecom.DisconnectCause.DisconnectCause(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/DisconnectCause#DisconnectCause(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.DisconnectCause.DisconnectCause(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -164,15 +164,15 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="label">To be added.</param>
-        <param name="description">To be added.</param>
-        <param name="reason">To be added.</param>
         <param name="code">The code for the disconnect cause.</param>
+        <param name="label">The localized label to show to the user to explain the disconnect.</param>
+        <param name="description">The localized description to show to the user to explain the disconnect.</param>
+        <param name="reason">The reason for the disconnect.</param>
         <summary>Creates a new DisconnectCause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/DisconnectCause#DisconnectCause(int)" title="Reference documentation">Java documentation for <code>android.telecom.DisconnectCause.DisconnectCause(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/DisconnectCause#DisconnectCause(int,%20java.lang.CharSequence,%20java.lang.CharSequence,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.DisconnectCause.DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -261,16 +261,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="label">To be added.</param>
-        <param name="description">To be added.</param>
-        <param name="reason">To be added.</param>
-        <param name="toneToPlay">To be added.</param>
         <param name="code">The code for the disconnect cause.</param>
+        <param name="label">The localized label to show to the user to explain the disconnect.</param>
+        <param name="description">The localized description to show to the user to explain the disconnect.</param>
+        <param name="reason">The reason for the disconnect.</param>
+        <param name="toneToPlay">The tone to play on disconnect, as defined in <c>ToneGenerator</c>.</param>
         <summary>Creates a new DisconnectCause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/DisconnectCause#DisconnectCause(int)" title="Reference documentation">Java documentation for <code>android.telecom.DisconnectCause.DisconnectCause(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/DisconnectCause#DisconnectCause(int,%20java.lang.CharSequence,%20java.lang.CharSequence,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.telecom.DisconnectCause.DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/RemoteConference.xml b/docs/Mono.Android/en/Android.Telecom/RemoteConference.xml
index bdffaa54cd..b34c773fff 100644
--- a/docs/Mono.Android/en/Android.Telecom/RemoteConference.xml
+++ b/docs/Mono.Android/en/Android.Telecom/RemoteConference.xml
@@ -492,8 +492,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">The callback to notify of state changes.</param>
+        <param name="handler">To be added.</param>
         <summary>Register a callback through which to receive state updates for this conference.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/RemoteConnection.xml b/docs/Mono.Android/en/Android.Telecom/RemoteConnection.xml
index 69a5b1c205..340d3dcad9 100644
--- a/docs/Mono.Android/en/Android.Telecom/RemoteConnection.xml
+++ b/docs/Mono.Android/en/Android.Telecom/RemoteConnection.xml
@@ -931,8 +931,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">A <c>Callback</c>.</param>
+        <param name="handler">To be added.</param>
         <summary>Adds a callback to this <c>RemoteConnection</c>.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/TelecomManager.xml b/docs/Mono.Android/en/Android.Telecom/TelecomManager.xml
index 857c02a5ec..b4a97d14cc 100644
--- a/docs/Mono.Android/en/Android.Telecom/TelecomManager.xml
+++ b/docs/Mono.Android/en/Android.Telecom/TelecomManager.xml
@@ -175,12 +175,13 @@
         <Parameter Name="videoState" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="videoState">To be added.</param>
-        <summary>If there is a ringing incoming call, this method accepts the call on behalf of the user.</summary>
+        <param name="videoState">The desired video state to answer the call with.</param>
+        <summary>If there is a ringing incoming call, this method accepts the call on behalf of the user,
+            with the specified video state.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/TelecomManager#acceptRingingCall()" title="Reference documentation">Java documentation for <code>android.telecom.TelecomManager.acceptRingingCall()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/TelecomManager#acceptRingingCall(int)" title="Reference documentation">Java documentation for <code>android.telecom.TelecomManager.acceptRingingCall(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2522,14 +2523,14 @@
         <Parameter Name="accountHandle" Type="Android.Telecom.PhoneAccountHandle" />
       </Parameters>
       <Docs>
-        <param name="accountHandle">To be added.</param>
+        <param name="accountHandle">The handle for the account the MMI code should apply to.</param>
         <param name="dialString">The digits to dial.</param>
         <summary>Processes the specified dial string as an MMI code.</summary>
         <returns>True if the digits were processed as an MMI code, false otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/TelecomManager#handleMmi(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telecom.TelecomManager.handleMmi(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/TelecomManager#handleMmi(java.lang.String,%20android.telecom.PhoneAccountHandle)" title="Reference documentation">Java documentation for <code>android.telecom.TelecomManager.handleMmi(java.lang.String, android.telecom.PhoneAccountHandle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telecom/VideoProfile.xml b/docs/Mono.Android/en/Android.Telecom/VideoProfile.xml
index f4b82ef7eb..0150f74bc9 100644
--- a/docs/Mono.Android/en/Android.Telecom/VideoProfile.xml
+++ b/docs/Mono.Android/en/Android.Telecom/VideoProfile.xml
@@ -124,13 +124,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="quality">To be added.</param>
         <param name="videoState">The video state.</param>
+        <param name="quality">The video quality.</param>
         <summary>Creates an instance of the VideoProfile</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telecom/VideoProfile#VideoProfile(int)" title="Reference documentation">Java documentation for <code>android.telecom.VideoProfile.VideoProfile(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telecom/VideoProfile#VideoProfile(int,%20int)" title="Reference documentation">Java documentation for <code>android.telecom.VideoProfile.VideoProfile(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony.Cdma/CdmaCellLocation.xml b/docs/Mono.Android/en/Android.Telephony.Cdma/CdmaCellLocation.xml
index 7aa9c5b2e5..3c7299a1be 100644
--- a/docs/Mono.Android/en/Android.Telephony.Cdma/CdmaCellLocation.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Cdma/CdmaCellLocation.xml
@@ -100,11 +100,11 @@
       </Parameters>
       <Docs>
         <param name="bundle">To be added.</param>
-        <summary>Empty constructor.</summary>
+        <summary>Initialize the object from a bundle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation#CdmaCellLocation()" title="Reference documentation">Java documentation for <code>android.telephony.cdma.CdmaCellLocation.CdmaCellLocation()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation#CdmaCellLocation(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.telephony.cdma.CdmaCellLocation.CdmaCellLocation(android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -516,7 +516,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation#setCellLocationData(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.cdma.CdmaCellLocation.setCellLocationData(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation#setCellLocationData(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.cdma.CdmaCellLocation.setCellLocationData(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+Builder.xml b/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+Builder.xml
index 4c63a5ee95..09b8fdfcbe 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+Builder.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting+Builder.xml
@@ -148,6 +148,78 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="SetApnTypeBitmask">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetApnTypeBitmask (Android.Telephony.Data.ApnType apnTypeBitmask);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetApnTypeBitmask(valuetype Android.Telephony.Data.ApnType apnTypeBitmask) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Android.Telephony.Data.ApnSetting.Builder.SetApnTypeBitmask(Android.Telephony.Data.ApnType)" />
+      <MemberSignature Language="F#" Value="abstract member SetApnTypeBitmask : Android.Telephony.Data.ApnType -&gt; Android.Telephony.Data.ApnSetting.Builder&#xA;override this.SetApnTypeBitmask : Android.Telephony.Data.ApnType -&gt; Android.Telephony.Data.ApnSetting.Builder" Usage="builder.SetApnTypeBitmask apnTypeBitmask" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[Android.Runtime.Register("setApnTypeBitmask", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetApnTypeBitmask_IHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;Android.Runtime.Register("setApnTypeBitmask", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetApnTypeBitmask_IHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.ApnSetting+Builder</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="apnTypeBitmask" Type="Android.Telephony.Data.ApnType">
+          <Attributes>
+            <Attribute>
+              <AttributeName Language="C#">[Android.Runtime.GeneratedEnum]</AttributeName>
+              <AttributeName Language="F#">[&lt;Android.Runtime.GeneratedEnum&gt;]</AttributeName>
+            </Attribute>
+          </Attributes>
+        </Parameter>
+      </Parameters>
+      <Docs>
+        <param name="apnTypeBitmask">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="SetAuthType">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetAuthType (Android.Telephony.Data.AuthType authType);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetAuthType(valuetype Android.Telephony.Data.AuthType authType) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Android.Telephony.Data.ApnSetting.Builder.SetAuthType(Android.Telephony.Data.AuthType)" />
+      <MemberSignature Language="F#" Value="abstract member SetAuthType : Android.Telephony.Data.AuthType -&gt; Android.Telephony.Data.ApnSetting.Builder&#xA;override this.SetAuthType : Android.Telephony.Data.AuthType -&gt; Android.Telephony.Data.ApnSetting.Builder" Usage="builder.SetAuthType authType" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[Android.Runtime.Register("setAuthType", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetAuthType_IHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;Android.Runtime.Register("setAuthType", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetAuthType_IHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.ApnSetting+Builder</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="authType" Type="Android.Telephony.Data.AuthType">
+          <Attributes>
+            <Attribute>
+              <AttributeName Language="C#">[Android.Runtime.GeneratedEnum]</AttributeName>
+              <AttributeName Language="F#">[&lt;Android.Runtime.GeneratedEnum&gt;]</AttributeName>
+            </Attribute>
+          </Attributes>
+        </Parameter>
+      </Parameters>
+      <Docs>
+        <param name="authType">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetCarrierEnabled">
       <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetCarrierEnabled (bool carrierEnabled);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetCarrierEnabled(bool carrierEnabled) cil managed" />
@@ -355,6 +427,42 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="SetMvnoType">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetMvnoType (Android.Telephony.Data.MvnoType mvnoType);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetMvnoType(valuetype Android.Telephony.Data.MvnoType mvnoType) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Android.Telephony.Data.ApnSetting.Builder.SetMvnoType(Android.Telephony.Data.MvnoType)" />
+      <MemberSignature Language="F#" Value="abstract member SetMvnoType : Android.Telephony.Data.MvnoType -&gt; Android.Telephony.Data.ApnSetting.Builder&#xA;override this.SetMvnoType : Android.Telephony.Data.MvnoType -&gt; Android.Telephony.Data.ApnSetting.Builder" Usage="builder.SetMvnoType mvnoType" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[Android.Runtime.Register("setMvnoType", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetMvnoType_IHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;Android.Runtime.Register("setMvnoType", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetMvnoType_IHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.ApnSetting+Builder</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="mvnoType" Type="Android.Telephony.Data.MvnoType">
+          <Attributes>
+            <Attribute>
+              <AttributeName Language="C#">[Android.Runtime.GeneratedEnum]</AttributeName>
+              <AttributeName Language="F#">[&lt;Android.Runtime.GeneratedEnum&gt;]</AttributeName>
+            </Attribute>
+          </Attributes>
+        </Parameter>
+      </Parameters>
+      <Docs>
+        <param name="mvnoType">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetNetworkTypeBitmask">
       <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetNetworkTypeBitmask (Android.Telephony.NetworkType networkTypeBitmask);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetNetworkTypeBitmask(valuetype Android.Telephony.NetworkType networkTypeBitmask) cil managed" />
@@ -449,6 +557,42 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="SetProtocol">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetProtocol (Android.Telephony.Data.Protocols protocol);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetProtocol(valuetype Android.Telephony.Data.Protocols protocol) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Android.Telephony.Data.ApnSetting.Builder.SetProtocol(Android.Telephony.Data.Protocols)" />
+      <MemberSignature Language="F#" Value="abstract member SetProtocol : Android.Telephony.Data.Protocols -&gt; Android.Telephony.Data.ApnSetting.Builder&#xA;override this.SetProtocol : Android.Telephony.Data.Protocols -&gt; Android.Telephony.Data.ApnSetting.Builder" Usage="builder.SetProtocol protocol" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[Android.Runtime.Register("setProtocol", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetProtocol_IHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;Android.Runtime.Register("setProtocol", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetProtocol_IHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.ApnSetting+Builder</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="protocol" Type="Android.Telephony.Data.Protocols">
+          <Attributes>
+            <Attribute>
+              <AttributeName Language="C#">[Android.Runtime.GeneratedEnum]</AttributeName>
+              <AttributeName Language="F#">[&lt;Android.Runtime.GeneratedEnum&gt;]</AttributeName>
+            </Attribute>
+          </Attributes>
+        </Parameter>
+      </Parameters>
+      <Docs>
+        <param name="protocol">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetProxyAddress">
       <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder? SetProxyAddress (Java.Net.InetAddress? proxy);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetProxyAddress(class Java.Net.InetAddress proxy) cil managed" />
@@ -540,6 +684,42 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="SetRoamingProtocol">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetRoamingProtocol (Android.Telephony.Data.Protocols roamingProtocol);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetRoamingProtocol(valuetype Android.Telephony.Data.Protocols roamingProtocol) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Android.Telephony.Data.ApnSetting.Builder.SetRoamingProtocol(Android.Telephony.Data.Protocols)" />
+      <MemberSignature Language="F#" Value="abstract member SetRoamingProtocol : Android.Telephony.Data.Protocols -&gt; Android.Telephony.Data.ApnSetting.Builder&#xA;override this.SetRoamingProtocol : Android.Telephony.Data.Protocols -&gt; Android.Telephony.Data.ApnSetting.Builder" Usage="builder.SetRoamingProtocol roamingProtocol" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[Android.Runtime.Register("setRoamingProtocol", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetRoamingProtocol_IHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;Android.Runtime.Register("setRoamingProtocol", "(I)Landroid/telephony/data/ApnSetting$Builder;", "GetSetRoamingProtocol_IHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.ApnSetting+Builder</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="roamingProtocol" Type="Android.Telephony.Data.Protocols">
+          <Attributes>
+            <Attribute>
+              <AttributeName Language="C#">[Android.Runtime.GeneratedEnum]</AttributeName>
+              <AttributeName Language="F#">[&lt;Android.Runtime.GeneratedEnum&gt;]</AttributeName>
+            </Attribute>
+          </Attributes>
+        </Parameter>
+      </Parameters>
+      <Docs>
+        <param name="roamingProtocol">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetUser">
       <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnSetting.Builder SetUser (string? user);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance class Android.Telephony.Data.ApnSetting/Builder SetUser(string user) cil managed" />
diff --git a/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting.xml b/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting.xml
index 0aff3f879e..7dc3af4620 100644
--- a/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Data/ApnSetting.xml
@@ -103,6 +103,78 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="ApnTypeBitmask">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.ApnType ApnTypeBitmask { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Android.Telephony.Data.ApnType ApnTypeBitmask" />
+      <MemberSignature Language="DocId" Value="P:Android.Telephony.Data.ApnSetting.ApnTypeBitmask" />
+      <MemberSignature Language="F#" Value="member this.ApnTypeBitmask : Android.Telephony.Data.ApnType" Usage="Android.Telephony.Data.ApnSetting.ApnTypeBitmask" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[get: Android.Runtime.Register("getApnTypeBitmask", "()I", "GetGetApnTypeBitmaskHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;get: Android.Runtime.Register("getApnTypeBitmask", "()I", "GetGetApnTypeBitmaskHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.ApnType</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Returns the bitmask of APN types.</summary>
+        <value>a bitmask describing the types of the APN</value>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/data/ApnSetting#getApnTypeBitmask()" title="Reference documentation">Java documentation for <code>android.telephony.data.ApnSetting.getApnTypeBitmask()</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="AuthType">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.AuthType AuthType { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Android.Telephony.Data.AuthType AuthType" />
+      <MemberSignature Language="DocId" Value="P:Android.Telephony.Data.ApnSetting.AuthType" />
+      <MemberSignature Language="F#" Value="member this.AuthType : Android.Telephony.Data.AuthType" Usage="Android.Telephony.Data.ApnSetting.AuthType" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[get: Android.Runtime.Register("getAuthType", "()I", "GetGetAuthTypeHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;get: Android.Runtime.Register("getAuthType", "()I", "GetGetAuthTypeHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.AuthType</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Returns the authentication type of the APN.</summary>
+        <value>authentication type</value>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/data/ApnSetting#getAuthType()" title="Reference documentation">Java documentation for <code>android.telephony.data.ApnSetting.getAuthType()</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="AuthTypeChap">
       <MemberSignature Language="C#" Value="public const Android.Telephony.Data.AuthType AuthTypeChap = 2;" />
       <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Android.Telephony.Data.AuthType AuthTypeChap = (2)" />
@@ -653,6 +725,42 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="MvnoType">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.MvnoType MvnoType { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Android.Telephony.Data.MvnoType MvnoType" />
+      <MemberSignature Language="DocId" Value="P:Android.Telephony.Data.ApnSetting.MvnoType" />
+      <MemberSignature Language="F#" Value="member this.MvnoType : Android.Telephony.Data.MvnoType" Usage="Android.Telephony.Data.ApnSetting.MvnoType" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[get: Android.Runtime.Register("getMvnoType", "()I", "GetGetMvnoTypeHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;get: Android.Runtime.Register("getMvnoType", "()I", "GetGetMvnoTypeHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.MvnoType</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Returns the MVNO match type for this APN.</summary>
+        <value>the MVNO match type</value>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/data/ApnSetting#getMvnoType()" title="Reference documentation">Java documentation for <code>android.telephony.data.ApnSetting.getMvnoType()</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="MvnoTypeGid">
       <MemberSignature Language="C#" Value="public const Android.Telephony.Data.MvnoType MvnoTypeGid = 2;" />
       <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Android.Telephony.Data.MvnoType MvnoTypeGid = (2)" />
@@ -933,6 +1041,42 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Protocol">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.Protocols Protocol { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Android.Telephony.Data.Protocols Protocol" />
+      <MemberSignature Language="DocId" Value="P:Android.Telephony.Data.ApnSetting.Protocol" />
+      <MemberSignature Language="F#" Value="member this.Protocol : Android.Telephony.Data.Protocols" Usage="Android.Telephony.Data.ApnSetting.Protocol" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[get: Android.Runtime.Register("getProtocol", "()I", "GetGetProtocolHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;get: Android.Runtime.Register("getProtocol", "()I", "GetGetProtocolHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.Protocols</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Returns the protocol to use to connect to this APN.</summary>
+        <value>the protocol</value>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/data/ApnSetting#getProtocol()" title="Reference documentation">Java documentation for <code>android.telephony.data.ApnSetting.getProtocol()</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="ProtocolIp">
       <MemberSignature Language="C#" Value="public const Android.Telephony.Data.Protocols ProtocolIp = 0;" />
       <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Android.Telephony.Data.Protocols ProtocolIp = (0)" />
@@ -1303,6 +1447,42 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="RoamingProtocol">
+      <MemberSignature Language="C#" Value="public virtual Android.Telephony.Data.Protocols RoamingProtocol { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Android.Telephony.Data.Protocols RoamingProtocol" />
+      <MemberSignature Language="DocId" Value="P:Android.Telephony.Data.ApnSetting.RoamingProtocol" />
+      <MemberSignature Language="F#" Value="member this.RoamingProtocol : Android.Telephony.Data.Protocols" Usage="Android.Telephony.Data.ApnSetting.RoamingProtocol" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Mono.Android</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Attributes>
+        <Attribute>
+          <AttributeName Language="C#">[get: Android.Runtime.Register("getRoamingProtocol", "()I", "GetGetRoamingProtocolHandler", ApiSince=28)]</AttributeName>
+          <AttributeName Language="F#">[&lt;get: Android.Runtime.Register("getRoamingProtocol", "()I", "GetGetRoamingProtocolHandler", ApiSince=28)&gt;]</AttributeName>
+        </Attribute>
+      </Attributes>
+      <ReturnValue>
+        <ReturnType>Android.Telephony.Data.Protocols</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Returns the protocol to use to connect to this APN while the device is roaming.</summary>
+        <value>the roaming protocol</value>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/data/ApnSetting#getRoamingProtocol()" title="Reference documentation">Java documentation for <code>android.telephony.data.ApnSetting.getRoamingProtocol()</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="ThresholdClass">
       <MemberSignature Language="C#" Value="protected override IntPtr ThresholdClass { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance native int ThresholdClass" />
diff --git a/docs/Mono.Android/en/Android.Telephony.Gsm/GsmCellLocation.xml b/docs/Mono.Android/en/Android.Telephony.Gsm/GsmCellLocation.xml
index 1674156251..f0ec05005e 100644
--- a/docs/Mono.Android/en/Android.Telephony.Gsm/GsmCellLocation.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Gsm/GsmCellLocation.xml
@@ -100,11 +100,11 @@
       </Parameters>
       <Docs>
         <param name="bundle">To be added.</param>
-        <summary>Empty constructor.</summary>
+        <summary>Initialize the object from a bundle.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation#GsmCellLocation()" title="Reference documentation">Java documentation for <code>android.telephony.gsm.GsmCellLocation.GsmCellLocation()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation#GsmCellLocation(android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.telephony.gsm.GsmCellLocation.GsmCellLocation(android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml b/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml
index f3feabcfdb..38b4191afd 100644
--- a/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml
+++ b/docs/Mono.Android/en/Android.Telephony.Gsm/SmsMessage.xml
@@ -197,7 +197,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage#calculateLength(java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.telephony.gsm.SmsMessage.calculateLength(java.lang.CharSequence, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage#calculateLength(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.telephony.gsm.SmsMessage.calculateLength(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -538,10 +538,10 @@
         <Parameter Name="statusReportRequested" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="scAddress">Service Centre address.  Null means use default.</param>
         <param name="destinationAddress">To be added.</param>
         <param name="message">To be added.</param>
         <param name="statusReportRequested">To be added.</param>
-        <param name="scAddress">Service Centre address.  Null means use default.</param>
         <summary>Get an SMS-SUBMIT PDU for a destination address and a message</summary>
         <returns>a &lt;code&gt;SubmitPdu&lt;/code&gt; containing the encoded SC
                     address, if applicable, and the encoded message.
@@ -592,12 +592,12 @@
         <Parameter Name="statusReportRequested" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="scAddress">Service Centre address.  Null means use default.</param>
         <param name="destinationAddress">the address of the destination for the message</param>
         <param name="destinationPort">the port to deliver the message to at the
         destination</param>
         <param name="data">the dat for the message</param>
         <param name="statusReportRequested">To be added.</param>
-        <param name="scAddress">Service Centre address.  Null means use default.</param>
         <summary>Get an SMS-SUBMIT PDU for a destination address and a message</summary>
         <returns>a &lt;code&gt;SubmitPdu&lt;/code&gt; containing the encoded SC
                     address, if applicable, and the encoded message.
diff --git a/docs/Mono.Android/en/Android.Telephony/MbmsDownloadSession.xml b/docs/Mono.Android/en/Android.Telephony/MbmsDownloadSession.xml
index e45cd6f67c..46da642653 100644
--- a/docs/Mono.Android/en/Android.Telephony/MbmsDownloadSession.xml
+++ b/docs/Mono.Android/en/Android.Telephony/MbmsDownloadSession.xml
@@ -305,15 +305,14 @@
       <Docs>
         <param name="context">The instance of <c>Context</c> to use</param>
         <param name="executor">The executor on which you wish to execute callbacks.</param>
-        <param name="subscriptionId">The data subscription ID to use</param>
         <param name="callback">A callback to get asynchronous error messages and file service updates.</param>
-        <summary>Create a new MbmsDownloadManager using the given subscription ID.</summary>
+        <summary>Create a new <c>MbmsDownloadSession</c> using the system default data subscription ID.</summary>
         <returns>A new instance of <c>MbmsDownloadSession</c>, or null if an error occurred during
             setup.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession#create(android.content.Context,%20java.util.concurrent.Executor,%20int,%20android.telephony.mbms.MbmsDownloadSessionCallback)" title="Reference documentation">Java documentation for <code>android.telephony.MbmsDownloadSession.create(android.content.Context, java.util.concurrent.Executor, int, android.telephony.mbms.MbmsDownloadSessionCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession#create(android.content.Context,%20java.util.concurrent.Executor,%20android.telephony.mbms.MbmsDownloadSessionCallback)" title="Reference documentation">Java documentation for <code>android.telephony.MbmsDownloadSession.create(android.content.Context, java.util.concurrent.Executor, android.telephony.mbms.MbmsDownloadSessionCallback)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/MbmsGroupCallSession.xml b/docs/Mono.Android/en/Android.Telephony/MbmsGroupCallSession.xml
index e6aa0d0ce8..fa864b84d7 100644
--- a/docs/Mono.Android/en/Android.Telephony/MbmsGroupCallSession.xml
+++ b/docs/Mono.Android/en/Android.Telephony/MbmsGroupCallSession.xml
@@ -132,16 +132,15 @@
       </Parameters>
       <Docs>
         <param name="context">The <c>Context</c> to use.</param>
-        <param name="subscriptionId">The subscription ID to use.</param>
         <param name="executor">The executor on which you wish to execute callbacks.</param>
         <param name="callback">A callback object on which you wish to receive results of asynchronous
                             operations.</param>
-        <summary>Create a new <c>MbmsGroupCallSession</c> using the given subscription ID.</summary>
+        <summary>Create a new <c>MbmsGroupCallSession</c> using the system default data subscription ID.</summary>
         <returns>An instance of <c>MbmsGroupCallSession</c>, or null if an error occurred.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/MbmsGroupCallSession#create(android.content.Context,%20int,%20java.util.concurrent.Executor,%20android.telephony.mbms.MbmsGroupCallSessionCallback)" title="Reference documentation">Java documentation for <code>android.telephony.MbmsGroupCallSession.create(android.content.Context, int, java.util.concurrent.Executor, android.telephony.mbms.MbmsGroupCallSessionCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/MbmsGroupCallSession#create(android.content.Context,%20java.util.concurrent.Executor,%20android.telephony.mbms.MbmsGroupCallSessionCallback)" title="Reference documentation">Java documentation for <code>android.telephony.MbmsGroupCallSession.create(android.content.Context, java.util.concurrent.Executor, android.telephony.mbms.MbmsGroupCallSessionCallback)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/MbmsStreamingSession.xml b/docs/Mono.Android/en/Android.Telephony/MbmsStreamingSession.xml
index 1d905e0758..dbd9eb903d 100644
--- a/docs/Mono.Android/en/Android.Telephony/MbmsStreamingSession.xml
+++ b/docs/Mono.Android/en/Android.Telephony/MbmsStreamingSession.xml
@@ -133,15 +133,14 @@
       <Docs>
         <param name="context">The <c>Context</c> to use.</param>
         <param name="executor">The executor on which you wish to execute callbacks.</param>
-        <param name="subscriptionId">The subscription ID to use.</param>
         <param name="callback">A callback object on which you wish to receive results of asynchronous
                             operations.</param>
-        <summary>Create a new <c>MbmsStreamingSession</c> using the given subscription ID.</summary>
+        <summary>Create a new <c>MbmsStreamingSession</c> using the system default data subscription ID.</summary>
         <returns>An instance of <c>MbmsStreamingSession</c>, or null if an error occurred.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/MbmsStreamingSession#create(android.content.Context,%20java.util.concurrent.Executor,%20int,%20android.telephony.mbms.MbmsStreamingSessionCallback)" title="Reference documentation">Java documentation for <code>android.telephony.MbmsStreamingSession.create(android.content.Context, java.util.concurrent.Executor, int, android.telephony.mbms.MbmsStreamingSessionCallback)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/MbmsStreamingSession#create(android.content.Context,%20java.util.concurrent.Executor,%20android.telephony.mbms.MbmsStreamingSessionCallback)" title="Reference documentation">Java documentation for <code>android.telephony.MbmsStreamingSession.create(android.content.Context, java.util.concurrent.Executor, android.telephony.mbms.MbmsStreamingSessionCallback)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo.xml b/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo.xml
index 1f6f8f1689..cb92947242 100644
--- a/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo.xml
+++ b/docs/Mono.Android/en/Android.Telephony/NeighboringCellInfo.xml
@@ -114,11 +114,11 @@
       </Parameters>
       <Docs>
         <param name="in">To be added.</param>
-        <summary>Empty constructor.</summary>
+        <summary>Initialize the object from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo#NeighboringCellInfo()" title="Reference documentation">Java documentation for <code>android.telephony.NeighboringCellInfo.NeighboringCellInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo#NeighboringCellInfo(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.telephony.NeighboringCellInfo.NeighboringCellInfo(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -157,11 +157,11 @@
       <Docs>
         <param name="rssi">To be added.</param>
         <param name="cid">To be added.</param>
-        <summary>Empty constructor.</summary>
+        <summary>Initialize the object from rssi and cid.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo#NeighboringCellInfo()" title="Reference documentation">Java documentation for <code>android.telephony.NeighboringCellInfo.NeighboringCellInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo#NeighboringCellInfo(int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.NeighboringCellInfo.NeighboringCellInfo(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -232,11 +232,18 @@
         <param name="rssi">To be added.</param>
         <param name="location">To be added.</param>
         <param name="radioType">To be added.</param>
-        <summary>Empty constructor.</summary>
+        <summary>Initialize the object from rssi, location string, and radioType
+            radioType is one of following
+            <c>TelephonyManager#NETWORK_TYPE_GPRS TelephonyManager.NETWORK_TYPE_GPRS</c>,
+            <c>TelephonyManager#NETWORK_TYPE_EDGE TelephonyManager.NETWORK_TYPE_EDGE</c>,
+            <c>TelephonyManager#NETWORK_TYPE_UMTS TelephonyManager.NETWORK_TYPE_UMTS</c>,
+            <c>TelephonyManager#NETWORK_TYPE_HSDPA TelephonyManager.NETWORK_TYPE_HSDPA</c>,
+            <c>TelephonyManager#NETWORK_TYPE_HSUPA TelephonyManager.NETWORK_TYPE_HSUPA</c>,
+            and <c>TelephonyManager#NETWORK_TYPE_HSPA TelephonyManager.NETWORK_TYPE_HSPA</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo#NeighboringCellInfo()" title="Reference documentation">Java documentation for <code>android.telephony.NeighboringCellInfo.NeighboringCellInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo#NeighboringCellInfo(int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.NeighboringCellInfo.NeighboringCellInfo(int, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml b/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml
index 3d7c580953..6c5d0ac41e 100644
--- a/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml
+++ b/docs/Mono.Android/en/Android.Telephony/PhoneNumberFormattingTextWatcher.xml
@@ -105,13 +105,13 @@
         <Parameter Name="countryCode" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="countryCode">To be added.</param>
-        <summary>The formatting is based on the current system locale and future locale changes
-            may not take effect on this instance.</summary>
+        <param name="countryCode">the ISO 3166-1 two-letter country code that indicates the country/region
+            where the phone number is being entered.</param>
+        <summary>The formatting is based on the given &lt;code&gt;countryCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberFormattingTextWatcher#PhoneNumberFormattingTextWatcher()" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberFormattingTextWatcher.PhoneNumberFormattingTextWatcher()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberFormattingTextWatcher#PhoneNumberFormattingTextWatcher(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberFormattingTextWatcher.PhoneNumberFormattingTextWatcher(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml b/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml
index 5b8242636b..bec93d3a1f 100644
--- a/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml
+++ b/docs/Mono.Android/en/Android.Telephony/PhoneNumberUtils.xml
@@ -326,7 +326,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#calledPartyBCDFragmentToString(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.calledPartyBCDFragmentToString(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#calledPartyBCDFragmentToString(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.calledPartyBCDFragmentToString(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -420,17 +420,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="bcdExtType">To be added.</param>
         <param name="bytes">the data buffer</param>
         <param name="offset">should point to the TOA (aka. TON/NPI) octet after the length byte</param>
         <param name="length">is the number of bytes including TOA byte
                            and must be at least 2</param>
+        <param name="bcdExtType">used to determine the extended bcd coding</param>
         <summary>3GPP TS 24.</summary>
         <returns>partial string on invalid decode</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#calledPartyBCDToString(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.calledPartyBCDToString(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#calledPartyBCDToString(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.calledPartyBCDToString(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -471,13 +471,12 @@
       <Docs>
         <param name="a">To be added.</param>
         <param name="b">To be added.</param>
-        <summary>Compare phone numbers a and b, and return true if they're identical
-            enough for caller ID purposes.</summary>
+        <summary>Compare phone numbers a and b, return true if they're identical enough for caller ID purposes.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#compare(android.content.Context,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.compare(android.content.Context, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#compare(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.compare(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -890,15 +889,14 @@
       </Parameters>
       <Docs>
         <param name="source">The phone number to format</param>
-        <param name="text">The number to be formatted, will be modified with the formatting</param>
-        <param name="defaultFormattingType">The default formatting rules to apply if the number does
-            not begin with +[country_code]</param>
-        <summary>Formats a phone number in-place.</summary>
-        <returns>To be added.</returns>
+        <summary>Breaks the given number down and formats it according to the rules
+            for the country the number is from.</summary>
+        <returns>A locally acceptable formatting of the input, or the raw input if
+             formatting rules aren't known for the number</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#formatNumber(android.text.Editable,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.formatNumber(android.text.Editable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#formatNumber(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.formatNumber(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -990,16 +988,13 @@
       <Docs>
         <param name="phoneNumber">the number to be formatted.</param>
         <param name="defaultCountryIso">the ISO 3166-1 two letters country code whose convention will
-            be used if the given number doesn't have the country code.</param>
-        <param name="text">The number to be formatted, will be modified with the formatting</param>
-        <param name="defaultFormattingType">The default formatting rules to apply if the number does
-            not begin with +[country_code]</param>
-        <summary>Formats a phone number in-place.</summary>
-        <returns>To be added.</returns>
+                       be used if the given number doesn't have the country code.</param>
+        <summary>Format a phone number.</summary>
+        <returns>the formatted number, or null if the given number is not valid.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#formatNumber(android.text.Editable,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.formatNumber(android.text.Editable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#formatNumber(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.formatNumber(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1037,19 +1032,17 @@
       <Docs>
         <param name="phoneNumber">the number to be formatted.</param>
         <param name="phoneNumberE164">the E164 format number whose country code is used if the given
-            phoneNumber doesn't have the country code.</param>
+                       phoneNumber doesn't have the country code.</param>
         <param name="defaultCountryIso">the ISO 3166-1 two letters country code whose convention will
-            be used if the phoneNumberE164 is null or invalid, or if phoneNumber
-            contains IDD.</param>
-        <param name="text">The number to be formatted, will be modified with the formatting</param>
-        <param name="defaultFormattingType">The default formatting rules to apply if the number does
-            not begin with +[country_code]</param>
-        <summary>Formats a phone number in-place.</summary>
-        <returns>To be added.</returns>
+                       be used if the phoneNumberE164 is null or invalid, or if phoneNumber
+                       contains IDD.</param>
+        <summary>Format the phone number only if the given number hasn't been formatted.</summary>
+        <returns>the formatted number if the given number has been formatted,
+                       otherwise, return the given number.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#formatNumber(android.text.Editable,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.formatNumber(android.text.Editable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#formatNumber(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.formatNumber(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1392,10 +1385,20 @@
       <Docs>
         <param name="number">the number to look up.</param>
         <summary>Checks a given number against the list of
- emergency numbers provided by the RIL and SIM card.</summary>
-        <returns>To be added.</returns>
+            emergency numbers provided by the RIL and SIM card.</summary>
+        <returns>true if the number is in the list of emergency numbers
+                    listed in the RIL / SIM, otherwise return false.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#isEmergencyNumber(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.isEmergencyNumber(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -1502,12 +1505,22 @@
         <Parameter Name="number" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="context">the specific context which the number should be checked against</param>
         <param name="number">the number to look up.</param>
+        <param name="context">the specific context which the number should be checked against</param>
         <summary>Checks if a given number is an emergency number for the country that the user is in.</summary>
-        <returns>To be added.</returns>
+        <returns>true if the specified number is an emergency number for the country the user
+            is currently in.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#isLocalEmergencyNumber(android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.isLocalEmergencyNumber(android.content.Context, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1660,10 +1673,21 @@
       <Docs>
         <param name="number">the number to look up.</param>
         <summary>isVoiceMailNumber: checks a given number against the voicemail
-   number provided by the RIL and SIM card.</summary>
-        <returns>To be added.</returns>
+              number provided by the RIL and SIM card.</summary>
+        <returns>true if the number is in the list of voicemail. False
+            otherwise, including if the caller does not have the permission
+            to read the VM number.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#isVoiceMailNumber(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.isVoiceMailNumber(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1942,15 +1966,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="bcdExtType">To be added.</param>
         <param name="number">dialing number string. If the dialing number starts with '+', set to
             international TOA</param>
+        <param name="bcdExtType">used to determine the extended bcd coding</param>
         <summary>Convert a dialing number to BCD byte array</summary>
         <returns>BCD byte array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#numberToCalledPartyBCD(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.numberToCalledPartyBCD(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils#numberToCalledPartyBCD(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneNumberUtils.numberToCalledPartyBCD(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/PhoneStateListener.xml b/docs/Mono.Android/en/Android.Telephony/PhoneStateListener.xml
index d523f3aa76..7d9a8b48d3 100644
--- a/docs/Mono.Android/en/Android.Telephony/PhoneStateListener.xml
+++ b/docs/Mono.Android/en/Android.Telephony/PhoneStateListener.xml
@@ -101,12 +101,12 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
-        <summary>Create a PhoneStateListener for the Phone with the default subscription.</summary>
+        <param name="executor">a non-null Executor that will execute callbacks for the PhoneStateListener.</param>
+        <summary>Create a PhoneStateListener for the Phone using the specified Executor</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneStateListener#PhoneStateListener()" title="Reference documentation">Java documentation for <code>android.telephony.PhoneStateListener.PhoneStateListener()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneStateListener#PhoneStateListener(java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneStateListener.PhoneStateListener(java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -921,11 +921,11 @@
       <Docs>
         <param name="state">To be added.</param>
         <param name="networkType">To be added.</param>
-        <summary>Callback invoked when connection state changes on the registered subscription.</summary>
+        <summary>same as above, but with the network type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/PhoneStateListener#onDataConnectionStateChanged(int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneStateListener.onDataConnectionStateChanged(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/PhoneStateListener#onDataConnectionStateChanged(int,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.PhoneStateListener.onDataConnectionStateChanged(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/ServiceState.xml b/docs/Mono.Android/en/Android.Telephony/ServiceState.xml
index b285711628..b542ffbce7 100644
--- a/docs/Mono.Android/en/Android.Telephony/ServiceState.xml
+++ b/docs/Mono.Android/en/Android.Telephony/ServiceState.xml
@@ -105,11 +105,11 @@
       </Parameters>
       <Docs>
         <param name="in">To be added.</param>
-        <summary>Empty constructor</summary>
+        <summary>Construct a ServiceState object from the given parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/ServiceState#ServiceState()" title="Reference documentation">Java documentation for <code>android.telephony.ServiceState.ServiceState()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/ServiceState#ServiceState(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.telephony.ServiceState.ServiceState(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,12 +141,12 @@
         <Parameter Name="s" Type="Android.Telephony.ServiceState" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Empty constructor</summary>
+        <param name="s">Source service state</param>
+        <summary>Copy constructors</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/ServiceState#ServiceState()" title="Reference documentation">Java documentation for <code>android.telephony.ServiceState.ServiceState()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/ServiceState#ServiceState(android.telephony.ServiceState)" title="Reference documentation">Java documentation for <code>android.telephony.ServiceState.ServiceState(android.telephony.ServiceState)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/SignalStrength.xml b/docs/Mono.Android/en/Android.Telephony/SignalStrength.xml
index e9c996a7d3..d59cc48bb7 100644
--- a/docs/Mono.Android/en/Android.Telephony/SignalStrength.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SignalStrength.xml
@@ -67,9 +67,20 @@
         <Parameter Name="s" Type="Android.Telephony.SignalStrength" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="s">Source SignalStrength</param>
+        <summary>This constructor is used to create a copy of an existing SignalStrength object.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/SignalStrength#SignalStrength(android.telephony.SignalStrength)" title="Reference documentation">Java documentation for <code>android.telephony.SignalStrength.SignalStrength(android.telephony.SignalStrength)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -444,13 +455,15 @@
         <Parameter Name="clazz" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="clazz">To be added.</param>
+        <param name="clazz">a class type that extends
+                   <c>android.telephony.CellSignalStrength CellSignalStrength</c> to filter possible
+                   return values.</param>
         <summary>Returns a List of CellSignalStrength Components of this SignalStrength Report.</summary>
         <returns>a List of CellSignalStrength or an empty List if there are no valid measurements.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SignalStrength#getCellSignalStrengths()" title="Reference documentation">Java documentation for <code>android.telephony.SignalStrength.getCellSignalStrengths()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SignalStrength#getCellSignalStrengths(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.telephony.SignalStrength.getCellSignalStrengths(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/SmsManager.xml b/docs/Mono.Android/en/Android.Telephony/SmsManager.xml
index a6d6fa7c09..a5f96fb829 100644
--- a/docs/Mono.Android/en/Android.Telephony/SmsManager.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SmsManager.xml
@@ -401,7 +401,6 @@
         <Parameter Name="messageId" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="messageId">To be added.</param>
         <param name="context">application context</param>
         <param name="locationUrl">the location URL of the MMS message to be downloaded, usually obtained
              from the MMS WAP push notification</param>
@@ -410,15 +409,17 @@
              downloading the message.</param>
         <param name="downloadedIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
              broadcast when the message is downloaded, or the download is failed</param>
+        <param name="messageId">an id that uniquely identifies the message requested to be downloaded.
+            Used for logging and diagnostics purposes. The id may be 0.</param>
         <summary>Download an MMS message from carrier by a given location URL
             
-            &lt;p class="note"&gt;&lt;strong&gt;Note:&lt;/strong&gt; If <c>#getDefault()</c> is used to instantiate this
-            manager on a multi-SIM device, this operation may fail downloading the MMS message because no
-            suitable default subscription could be found.</summary>
+            Same as <c>#downloadMultimediaMessage(Context context, String locationUrl,
+                 Uri contentUri, Bundle configOverrides, PendingIntent downloadedIntent)</c>,
+                 but adds an optional messageId.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SmsManager#downloadMultimediaMessage(android.content.Context,%20java.lang.String,%20android.net.Uri,%20android.os.Bundle,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.downloadMultimediaMessage(android.content.Context, java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SmsManager#downloadMultimediaMessage(android.content.Context,%20java.lang.String,%20android.net.Uri,%20android.os.Bundle,%20android.app.PendingIntent,%20long)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.downloadMultimediaMessage(android.content.Context, java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4247,7 +4248,6 @@
         <Parameter Name="messageId" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="messageId">To be added.</param>
         <param name="context">application context</param>
         <param name="contentUri">the content Uri from which the message pdu will be read</param>
         <param name="locationUrl">the optional location url where message should be sent to</param>
@@ -4255,15 +4255,16 @@
              sending the message.</param>
         <param name="sentIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
              broadcast when the message is successfully sent, or failed</param>
+        <param name="messageId">an id that uniquely identifies the message requested to be sent.
+            Used for logging and diagnostics purposes. The id may be 0.</param>
         <summary>Send an MMS message
             
-            &lt;p class="note"&gt;&lt;strong&gt;Note:&lt;/strong&gt; If <c>#getDefault()</c> is used to instantiate this
-            manager on a multi-SIM device, this operation may fail sending the MMS message because no
-            suitable default subscription could be found.</summary>
+            Same as <c>#sendMultimediaMessage(Context context, Uri contentUri, String locationUrl,
+                      Bundle configOverrides, PendingIntent sentIntent)</c>, but adds an optional messageId.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendMultimediaMessage(android.content.Context,%20android.net.Uri,%20java.lang.String,%20android.os.Bundle,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendMultimediaMessage(android.content.Context,%20android.net.Uri,%20java.lang.String,%20android.os.Bundle,%20android.app.PendingIntent,%20long)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4418,7 +4419,6 @@
         <Parameter Name="messageId" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="messageId">To be added.</param>
         <param name="destinationAddress">the address to send the message to</param>
         <param name="scAddress">is the service center address or null to use
              the current default SMSC</param>
@@ -4493,11 +4493,13 @@
              broadcast when the corresponding message part has been delivered
              to the recipient.  The raw pdu of the status report is in the
              extended data ("pdu").</param>
+        <param name="messageId">An id that uniquely identifies the message requested to be sent.
+            Used for logging and diagnostics purposes. The id may be 0.</param>
         <summary>Send a multi-part text based SMS.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendMultipartTextMessage(java.lang.String,%20java.lang.String,%20java.util.ArrayList,%20java.util.ArrayList,%20java.util.ArrayList)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList, java.util.ArrayList, java.util.ArrayList)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendMultipartTextMessage(java.lang.String,%20java.lang.String,%20java.util.List,%20java.util.List,%20java.util.List,%20long)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.List, java.util.List, java.util.List, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4537,8 +4539,6 @@
         <Parameter Name="attributionTag" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="attributionTag">To be added.</param>
         <param name="destinationAddress">the address to send the message to</param>
         <param name="scAddress">is the service center address or null to use
              the current default SMSC</param>
@@ -4613,11 +4613,15 @@
              broadcast when the corresponding message part has been delivered
              to the recipient.  The raw pdu of the status report is in the
              extended data ("pdu").</param>
-        <summary>Send a multi-part text based SMS.</summary>
+        <param name="attributionTag">To be added.</param>
+        <param name="packageName">serves as the default package name if the package name that is
+                   associated with the user id is null.</param>
+        <summary>Similar method as #sendMultipartTextMessage(String, String, ArrayList, ArrayList, ArrayList)
+            With an additional argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendMultipartTextMessage(java.lang.String,%20java.lang.String,%20java.util.ArrayList,%20java.util.ArrayList,%20java.util.ArrayList)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList, java.util.ArrayList, java.util.ArrayList)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendMultipartTextMessage(java.lang.String,%20java.lang.String,%20java.util.List,%20java.util.List,%20java.util.List,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.List, java.util.List, java.util.List, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -4771,7 +4775,6 @@
         <Parameter Name="messageId" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="messageId">To be added.</param>
         <param name="destinationAddress">the address to send the message to</param>
         <param name="scAddress">is the service center address or null to use
              the current default SMSC</param>
@@ -4842,11 +4845,13 @@
         <param name="deliveryIntent">if not NULL this &lt;code&gt;PendingIntent&lt;/code&gt; is
              broadcast when the message is delivered to the recipient.  The
              raw pdu of the status report is in the extended data ("pdu").</param>
+        <param name="messageId">An id that uniquely identifies the message requested to be sent.
+            Used for logging and diagnostics purposes. The id may be 0.</param>
         <summary>Send a text based SMS.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendTextMessage(java.lang.String,%20java.lang.String,%20java.lang.String,%20android.app.PendingIntent,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendTextMessage(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SmsManager#sendTextMessage(java.lang.String,%20java.lang.String,%20java.lang.String,%20android.app.PendingIntent,%20android.app.PendingIntent,%20long)" title="Reference documentation">Java documentation for <code>android.telephony.SmsManager.sendTextMessage(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml b/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml
index b1420be3cc..d21be913d8 100644
--- a/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SmsMessage.xml
@@ -133,22 +133,18 @@
       </Parameters>
       <Docs>
         <param name="messageBody">the message to encode</param>
-        <param name="msgBody">the message to encode</param>
-        <param name="use7bitOnly">if true, characters that are not part of the radio-specific 7-bit encoding
-                are counted as single space chars. If false, and if the messageBody contains non-7-bit
-                encodable characters, length is calculated using a 16-bit encoding.</param>
+        <param name="use7bitOnly">if true, characters that are not part of the radio specific (GSM / CDMA)
+                alphabet encoding are converted to as a single space characters. If false, a messageBody
+                containing non-GSM or non-CDMA alphabet characters are encoded using 16-bit encoding.</param>
         <summary>Calculates the number of SMS's required to encode the message body and the number of
-            characters remaining until the next message.</summary>
-        <returns>an int[6] with int[0] being the number of SMS's required, int[1] the number of code
+            characters remaining until the next message, given the current encoding.</summary>
+        <returns>an int[4] with int[0] being the number of SMS's required, int[1] the number of code
                 units used, and int[2] is the number of code units remaining until the next message.
-                int[3] is an indicator of the encoding code unit size (see the ENCODING_* definitions in
-                SmsConstants). int[4] is the GSM national language table to use, or 0 for the default
-                7-bit alphabet. int[5] The GSM national language shift table to use, or 0 for the default
-                7-bit extension table.</returns>
+                int[3] is the encoding type that should be used for the message.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SmsMessage#calculateLength(java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.telephony.SmsMessage.calculateLength(java.lang.CharSequence, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SmsMessage#calculateLength(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.telephony.SmsMessage.calculateLength(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -229,14 +225,16 @@
         <Parameter Name="format" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pdu">To be added.</param>
-        <param name="format">To be added.</param>
-        <summary>Create an SmsMessage from a raw PDU.</summary>
+        <param name="pdu">the message PDU from the
+            <c>android.provider.Telephony.Sms.Intents#SMS_RECEIVED_ACTION</c> intent</param>
+        <param name="format">the format extra from the
+            <c>android.provider.Telephony.Sms.Intents#SMS_RECEIVED_ACTION</c> intent</param>
+        <summary>Create an SmsMessage from a raw PDU with the specified message format.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/SmsMessage#createFromPdu(byte[])" title="Reference documentation">Java documentation for <code>android.telephony.SmsMessage.createFromPdu(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/SmsMessage#createFromPdu(byte[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.SmsMessage.createFromPdu(byte[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -622,12 +620,11 @@
         <Parameter Name="statusReportRequested" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="scAddress">Service Centre address. Null means use default.</param>
+        <param name="destinationAddress">the address of the destination for the message.</param>
         <param name="destinationPort">the port to deliver the message to at the
         destination</param>
         <param name="data">the data for the message</param>
-        <param name="scAddress">Service Centre address. Null means use default.</param>
-        <param name="destinationAddress">the address of the destination for the message.</param>
-        <param name="message">string representation of the message payload.</param>
         <param name="statusReportRequested">indicates whether a report is requested for this message.</param>
         <summary>Gets an SMS-SUBMIT PDU for a destination address and a message.</summary>
         <returns>a &lt;code&gt;SubmitPdu&lt;/code&gt; containing the encoded SC address if applicable and the
diff --git a/docs/Mono.Android/en/Android.Telephony/SubscriptionManager.xml b/docs/Mono.Android/en/Android.Telephony/SubscriptionManager.xml
index fd48ee6aa5..6bd074c1c6 100644
--- a/docs/Mono.Android/en/Android.Telephony/SubscriptionManager.xml
+++ b/docs/Mono.Android/en/Android.Telephony/SubscriptionManager.xml
@@ -2193,10 +2193,10 @@
         <Parameter Name="timeoutMillis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="networkTypes">To be added.</param>
         <param name="subId">the subscriber this override applies to.</param>
         <param name="overrideCongested">set if the subscription should be considered
                        congested.</param>
+        <param name="networkTypes">To be added.</param>
         <param name="timeoutMillis">the timeout after which the requested override will
                        be automatically cleared, or <c>0</c> to leave in the
                        requested state until explicitly cleared, or the next reboot,
@@ -2291,10 +2291,10 @@
         <Parameter Name="timeoutMillis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="networkTypes">To be added.</param>
         <param name="subId">the subscriber this override applies to.</param>
         <param name="overrideUnmetered">set if the billing relationship should be
                        considered unmetered.</param>
+        <param name="networkTypes">To be added.</param>
         <param name="timeoutMillis">the timeout after which the requested override will
                        be automatically cleared, or <c>0</c> to leave in the
                        requested state until explicitly cleared, or the next reboot,
diff --git a/docs/Mono.Android/en/Android.Telephony/TelephonyManager.xml b/docs/Mono.Android/en/Android.Telephony/TelephonyManager.xml
index 9d254742cc..3b27523786 100644
--- a/docs/Mono.Android/en/Android.Telephony/TelephonyManager.xml
+++ b/docs/Mono.Android/en/Android.Telephony/TelephonyManager.xml
@@ -1832,14 +1832,21 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Returns whether mobile data is enabled or not per user setting.</summary>
+        <summary>Returns whether mobile data is enabled or not per user setting. -or- Values used to return status for hasCarrierPrivileges call.</summary>
         <value>true if mobile data is enabled.</value>
         <remarks>
+          <para>Property getter documentation:</para>
           <para>
             <format type="text/html">
               <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#isDataEnabled()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.isDataEnabled()</code>.</a>
             </format>
           </para>
+          <para>Property setter documentation:</para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#setDataEnabled(boolean)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.setDataEnabled(boolean)</code>.</a>
+            </format>
+          </para>
           <para>
                     Portions of this page are modifications based on work created and shared by the 
                     <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
@@ -3422,14 +3429,14 @@
         <Parameter Name="slotIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="slotIndex">To be added.</param>
-        <summary>Returns the unique device ID, for example, the IMEI for GSM and the MEID
-            or ESN for CDMA phones.</summary>
+        <param name="slotIndex">of which deviceID is returned</param>
+        <summary>Returns the unique device ID of a subscription, for example, the IMEI for
+            GSM and the MEID for CDMA phones.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getDeviceId()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getDeviceId()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getDeviceId(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getDeviceId(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3474,8 +3481,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="categories">To be added.</param>
-        <summary>Get the emergency number list based on current locale, sim, default, modem and network.</summary>
+        <param name="categories">the emergency service categories which are the bitwise-OR combination of
+            the following constants:
+            &lt;ol&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED</c>&lt;/li&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_POLICE</c>&lt;/li&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_AMBULANCE</c>&lt;/li&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_FIRE_BRIGADE</c>&lt;/li&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_MARINE_GUARD</c>&lt;/li&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_MOUNTAIN_RESCUE</c>&lt;/li&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_MIEC</c>&lt;/li&gt;
+            &lt;li&gt;<c>EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_AIEC</c>&lt;/li&gt;
+            &lt;/ol&gt;</param>
+        <summary>Get the per-category emergency number list based on current locale, sim, default, modem
+            and network.</summary>
         <returns>Map including the keys as the active subscription IDs (Note: if there is no active
             subscription, the key is <c>SubscriptionManager#getDefaultSubscriptionId</c>) and the value
             as the list of <c>EmergencyNumber</c>; empty Map if this information is not available;
@@ -3483,7 +3502,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getEmergencyNumberList()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getEmergencyNumberList()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getEmergencyNumberList(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getEmergencyNumberList(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3575,13 +3594,29 @@
         <Parameter Name="data" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="appType">To be added.</param>
-        <param name="authType">To be added.</param>
-        <param name="data">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="appType">the icc application type, like <c>#APPTYPE_USIM</c></param>
+        <param name="authType">the authentication type, <c>#AUTHTYPE_EAP_AKA</c> or
+            <c>#AUTHTYPE_EAP_SIM</c></param>
+        <param name="data">authentication challenge data, base64 encoded.
+            See 3GPP TS 31.102 7.1.2 for more details.</param>
+        <summary>Returns the response of authentication for the default subscription.</summary>
+        <returns>the response of authentication. This value will be null in the following cases:
+              Authentication error, incorrect MAC
+              Authentication error, security context not supported
+              Key freshness failure
+              Authentication error, no memory space available
+              Authentication error, no memory space available in EFMUK</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getIccAuthentication(int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getIccAuthentication(int, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -3612,13 +3647,13 @@
         <Parameter Name="slotIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="slotIndex">To be added.</param>
+        <param name="slotIndex">of which IMEI is returned</param>
         <summary>Returns the IMEI (International Mobile Equipment Identity).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getImei()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getImei()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getImei(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getImei(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3652,13 +3687,13 @@
         <Parameter Name="slotIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="slotIndex">To be added.</param>
+        <param name="slotIndex">of which Type Allocation Code is returned</param>
         <summary>Returns the Manufacturer Code from the MEID.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getManufacturerCode()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getManufacturerCode()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getManufacturerCode(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getManufacturerCode(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3696,13 +3731,13 @@
         <Parameter Name="slotIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="slotIndex">To be added.</param>
+        <param name="slotIndex">of which MEID is returned</param>
         <summary>Returns the MEID (Mobile Equipment Identifier).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getMeid()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getMeid()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getMeid(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getMeid(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3736,7 +3771,7 @@
         <Parameter Name="slotIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="slotIndex">To be added.</param>
+        <param name="slotIndex">the SIM slot index to get network country ISO.</param>
         <summary>Returns the ISO-3166-1 alpha-2 country code equivalent of the MCC (Mobile Country Code) of
             the current registered operator or the cell nearby, if available.</summary>
         <returns>the lowercase 2 character ISO-3166-1 alpha-2 country code, or empty string if not
@@ -3744,7 +3779,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getNetworkCountryIso()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getNetworkCountryIso()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getNetworkCountryIso(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getNetworkCountryIso(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3830,13 +3865,13 @@
         <Parameter Name="slotIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="slotIndex">To be added.</param>
-        <summary>Returns a constant indicating the state of the default SIM card.</summary>
+        <param name="slotIndex">logical slot index</param>
+        <summary>Returns a constant indicating the state of the device SIM card in a logical slot.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getSimState()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getSimState()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getSimState(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getSimState(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3874,13 +3909,16 @@
         <Parameter Name="phoneAccountHandle" Type="Android.Telecom.PhoneAccountHandle" />
       </Parameters>
       <Docs>
-        <param name="phoneAccountHandle">To be added.</param>
-        <summary>Return an appropriate subscription ID for any situation.</summary>
-        <returns>To be added.</returns>
+        <param name="phoneAccountHandle">the phone account handle for outgoing calls</param>
+        <summary>Returns the subscription ID for the given phone account handle.</summary>
+        <returns>subscription ID for the given phone account handle; or
+                    <c>SubscriptionManager#INVALID_SUBSCRIPTION_ID</c>
+                    if not available; or throw a SecurityException if the caller doesn't have the
+                    permission.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getSubscriptionId()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getSubscriptionId()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getSubscriptionId(android.telecom.PhoneAccountHandle)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getSubscriptionId(android.telecom.PhoneAccountHandle)</code>.</a>
             </format>
           </para>
           <para>
@@ -3914,13 +3952,13 @@
         <Parameter Name="slotIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="slotIndex">To be added.</param>
+        <param name="slotIndex">of which Type Allocation Code is returned</param>
         <summary>Returns the Type Allocation Code from the IMEI.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getTypeAllocationCode()" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getTypeAllocationCode()</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#getTypeAllocationCode(int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.getTypeAllocationCode(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4167,14 +4205,25 @@
       <Docs>
         <param name="fileID">To be added.</param>
         <param name="command">To be added.</param>
+        <param name="filePath">To be added.</param>
+        <param name="fileID&#xA;@param&#xA;@param">command</param>
         <param name="p1">P1 value of the APDU command.</param>
         <param name="p2">P2 value of the APDU command.</param>
         <param name="p3">P3 value of the APDU command.</param>
-        <param name="filePath">To be added.</param>
+        <param name="filePath&#xA;@return&#xA;@return">The APDU response.</param>
         <summary>Returns the response APDU for a command APDU sent through SIM_IO.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#iccExchangeSimIO(int,%20int,%20int,%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.iccExchangeSimIO(int, int, int, int, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -4207,9 +4256,18 @@
       <Docs>
         <param name="AID">Application id. See ETSI 102.221 and 101.220.</param>
         <summary>Opens a logical channel to the ICC card.</summary>
-        <returns>To be added.</returns>
+        <returns>an IccOpenLogicalChannelResponse object.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#iccOpenLogicalChannel(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.iccOpenLogicalChannel(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -4241,12 +4299,21 @@
         <Parameter Name="p2" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="AID">To be added.</param>
-        <param name="p2">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="AID">Application id. See ETSI 102.221 and 101.220.</param>
+        <param name="p2">P2 parameter (described in ISO 7816-4).</param>
+        <summary>Opens a logical channel to the ICC card.</summary>
+        <returns>an IccOpenLogicalChannelResponse object.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#iccOpenLogicalChannel(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.iccOpenLogicalChannel(java.lang.String, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -4287,12 +4354,22 @@
         <param name="p1">P1 value of the APDU command.</param>
         <param name="p2">P2 value of the APDU command.</param>
         <param name="p3">P3 value of the APDU command. If p3 is negative a 4 byte APDU
-            is sent to the SIM.</param>
+                       is sent to the SIM.</param>
         <param name="data">Data to be sent with the APDU.</param>
         <summary>Transmit an APDU to the ICC card over the basic channel.</summary>
-        <returns>To be added.</returns>
+        <returns>The APDU response from the ICC card with the status appended at
+                       the end.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#iccTransmitApduBasicChannel(int,%20int,%20int,%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -4330,18 +4407,28 @@
       </Parameters>
       <Docs>
         <param name="channel">is the channel id to be closed as returned by a successful
-            iccOpenLogicalChannel.</param>
+                       iccOpenLogicalChannel.</param>
         <param name="cla">Class of the APDU command.</param>
         <param name="instruction">Instruction of the APDU command.</param>
         <param name="p1">P1 value of the APDU command.</param>
         <param name="p2">P2 value of the APDU command.</param>
         <param name="p3">P3 value of the APDU command. If p3 is negative a 4 byte APDU
-            is sent to the SIM.</param>
+                       is sent to the SIM.</param>
         <param name="data">Data to be sent with the APDU.</param>
         <summary>Transmit an APDU to the ICC card over a logical channel.</summary>
-        <returns>To be added.</returns>
+        <returns>The APDU response from the ICC card with the status appended at
+                       the end.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#iccTransmitApduLogicalChannel(int,%20int,%20int,%20int,%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -6366,12 +6453,23 @@
       </Parameters>
       <Docs>
         <param name="content">String containing SAT/USAT response in hexadecimal
-                format starting with command tag. See TS 102 223 for
-                details.</param>
+                           format starting with command tag. See TS 102 223 for
+                           details.</param>
         <summary>Send ENVELOPE to the SIM and return the response.</summary>
-        <returns>To be added.</returns>
+        <returns>The APDU response from the ICC card in hexadecimal format
+                    with the last 4 bytes being the status word. If the command fails,
+                    returns an empty string.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#sendEnvelopeWithStatus(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.sendEnvelopeWithStatus(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -6633,12 +6731,22 @@
         <Parameter Name="number" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="alphaTag">To be added.</param>
-        <param name="number">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="alphaTag">alpha-tagging of the dailing nubmer</param>
+        <param name="number">The dialing number</param>
+        <summary>Set the line 1 phone number string and its alphatag for the current ICCID
+            for display purpose only, for example, displayed in Phone Status.</summary>
+        <returns>true if the operation was executed correctly.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#setLine1NumberForDisplay(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.setLine1NumberForDisplay(java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -6710,11 +6818,25 @@
         <Parameter Name="persistSelection" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="operatorNumeric">To be added.</param>
-        <param name="persistSelection">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="operatorNumeric">the PLMN ID of the network to select.</param>
+        <param name="persistSelection">whether the selection will persist until reboot. If true, only allows
+            attaching to the selected PLMN until reboot; otherwise, attach to the chosen PLMN and resume
+            normal network selection next time.</param>
+        <summary>Ask the radio to connect to the input network and change selection mode to manual.</summary>
+        <returns>
+          <c>true</c> on success; <c>false</c> on any failure.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#setNetworkSelectionModeManual(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.setNetworkSelectionModeManual(java.lang.String, boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="SetNetworkSelectionModeManual">
@@ -6753,12 +6875,30 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="operatorNumeric">To be added.</param>
-        <param name="persistSelection">To be added.</param>
-        <param name="ran">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="operatorNumeric">the PLMN ID of the network to select.</param>
+        <param name="persistSelection">whether the selection will persist until reboot.
+                    If true, only allows attaching to the selected PLMN until reboot; otherwise,
+                    attach to the chosen PLMN and resume normal network selection next time.</param>
+        <param name="ran">the initial suggested radio access network type.
+                    If registration fails, the RAN is not available after, the RAN is not within the
+                    network types specified by the preferred network types, or the value is
+                    <c>AccessNetworkConstants.AccessNetworkType#UNKNOWN</c>, modem will select
+                    the next best RAN for network registration.</param>
+        <summary>Ask the radio to connect to the input network and change selection mode to manual.</summary>
+        <returns>
+          <c>true</c> on success; <c>false</c> on any failure.</returns>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#setNetworkSelectionModeManual(java.lang.String,%20boolean,%20int)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.setNetworkSelectionModeManual(java.lang.String, boolean, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="SetOperatorBrandOverride">
@@ -6784,11 +6924,20 @@
         <Parameter Name="brand" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="brand">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="brand">The brand name to display/set.</param>
+        <summary>Override the branding for the current ICCID.</summary>
+        <returns>true if the operation was executed correctly.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#setOperatorBrandOverride(java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.setOperatorBrandOverride(java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -7166,12 +7315,21 @@
         <Parameter Name="number" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="alphaTag">To be added.</param>
-        <param name="number">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="alphaTag">The alpha tag to display.</param>
+        <param name="number">The voicemail number.</param>
+        <summary>Sets the voice mail number.</summary>
         <returns>To be added.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#setVoiceMailNumber(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.setVoiceMailNumber(java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -8584,26 +8742,17 @@
         <Parameter Name="callback" Type="Android.OS.IOutcomeReceiver" />
       </Parameters>
       <Docs>
-        <param name="pictureToUpload">An <c>InputStream</c> that supplies the bytes representing the
-                                   picture to upload. The client bears responsibility for closing this
-                                   stream after <c>callback</c> is called with success or failure.
-            
-                                   Additionally, if the stream supplies more bytes than the return value
-                                   of <c>#getMaximumCallComposerPictureSize()</c>, the upload will be
-                                   aborted and the callback will be called with an exception containing
-                                   <c>CallComposerException#ERROR_FILE_TOO_LARGE</c>.</param>
-        <param name="contentType">The MIME type of the picture you're uploading (e.g. image/jpeg). The list
-                               of acceptable content types can be found at 3GPP TS 26.141 sections
-                               4.2 and 4.3.</param>
-        <param name="executor">The <c>Executor</c> on which the <c>pictureToUpload</c> stream will be
-                            read, as well as on which the callback will be called.</param>
+        <param name="pictureToUpload">Path to a local file containing the picture to upload.</param>
+        <param name="contentType">The MIME type of the picture you're uploading (e.g. image/jpeg)</param>
+        <param name="executor">The <c>Executor</c> on which the <c>pictureToUpload</c> file will be read
+                            from disk, as well as on which <c>callback</c> will be called.</param>
         <param name="callback">A callback called when the upload operation terminates, either in success
                             or in error.</param>
         <summary>Uploads a picture to the carrier network for use with call composer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#uploadCallComposerPicture(java.io.InputStream,%20java.lang.String,%20java.util.concurrent.Executor,%20android.os.OutcomeReceiver)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.uploadCallComposerPicture(java.io.InputStream, java.lang.String, java.util.concurrent.Executor, android.os.OutcomeReceiver)</code>.</a>
+              <a href="https://developer.android.com/reference/android/telephony/TelephonyManager#uploadCallComposerPicture(java.nio.file.Path,%20java.lang.String,%20java.util.concurrent.Executor,%20android.os.OutcomeReceiver)" title="Reference documentation">Java documentation for <code>android.telephony.TelephonyManager.uploadCallComposerPicture(java.nio.file.Path, java.lang.String, java.util.concurrent.Executor, android.os.OutcomeReceiver)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Test.Mock/MockContentProvider.xml b/docs/Mono.Android/en/Android.Test.Mock/MockContentProvider.xml
index d145c25a81..8f84ea2567 100644
--- a/docs/Mono.Android/en/Android.Test.Mock/MockContentProvider.xml
+++ b/docs/Mono.Android/en/Android.Test.Mock/MockContentProvider.xml
@@ -88,11 +88,12 @@
       </Parameters>
       <Docs>
         <param name="context">To be added.</param>
-        <summary>A constructor using <c>MockContext</c> instance as a Context in it.</summary>
+        <summary>A constructor accepting a Context instance, which is supposed to be the subclasss of
+            <c>MockContext</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/mock/MockContentProvider#MockContentProvider()" title="Reference documentation">Java documentation for <code>android.test.mock.MockContentProvider.MockContentProvider()</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/mock/MockContentProvider#MockContentProvider(android.content.Context)" title="Reference documentation">Java documentation for <code>android.test.mock.MockContentProvider.MockContentProvider(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -150,15 +151,20 @@
         <Parameter Name="pathPermissions" Type="Android.Content.PM.PathPermission[]" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="readPermission">To be added.</param>
-        <param name="writePermission">To be added.</param>
-        <param name="pathPermissions">To be added.</param>
-        <summary>A constructor using <c>MockContext</c> instance as a Context in it.</summary>
+        <param name="context">A Context object which should be some mock instance (like the
+            instance of <c>android.test.mock.MockContext</c>).</param>
+        <param name="readPermission">The read permision you want this instance should have in the
+            test, which is available via <c>#getReadPermission()</c>.</param>
+        <param name="writePermission">The write permission you want this instance should have
+            in the test, which is available via <c>#getWritePermission()</c>.</param>
+        <param name="pathPermissions">The PathPermissions you want this instance should have
+            in the test, which is available via <c>#getPathPermissions()</c>.</param>
+        <summary>A constructor which initialize four member variables which
+            <c>android.content.ContentProvider</c> have internally.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/mock/MockContentProvider#MockContentProvider()" title="Reference documentation">Java documentation for <code>android.test.mock.MockContentProvider.MockContentProvider()</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/mock/MockContentProvider#MockContentProvider(android.content.Context,%20java.lang.String,%20java.lang.String,%20android.content.pm.PathPermission[])" title="Reference documentation">Java documentation for <code>android.test.mock.MockContentProvider.MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Test.Mock/MockContentResolver.xml b/docs/Mono.Android/en/Android.Test.Mock/MockContentResolver.xml
index 38df3e6bc6..2f71c00be5 100644
--- a/docs/Mono.Android/en/Android.Test.Mock/MockContentResolver.xml
+++ b/docs/Mono.Android/en/Android.Test.Mock/MockContentResolver.xml
@@ -93,7 +93,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/mock/MockContentResolver#MockContentResolver()" title="Reference documentation">Java documentation for <code>android.test.mock.MockContentResolver.MockContentResolver()</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/mock/MockContentResolver#MockContentResolver(android.content.Context)" title="Reference documentation">Java documentation for <code>android.test.mock.MockContentResolver.MockContentResolver(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Test.Suitebuilder/TestSuiteBuilder.xml b/docs/Mono.Android/en/Android.Test.Suitebuilder/TestSuiteBuilder.xml
index 8b61b14e85..8738670e37 100644
--- a/docs/Mono.Android/en/Android.Test.Suitebuilder/TestSuiteBuilder.xml
+++ b/docs/Mono.Android/en/Android.Test.Suitebuilder/TestSuiteBuilder.xml
@@ -124,9 +124,6 @@
       <Docs>
         <param name="name">To be added.</param>
         <param name="classLoader">To be added.</param>
-        <param name="clazz">Use the class from your .apk. Use the class name for the test suite name.
-                         Use the class' classloader in order to load classes for testing.
-                         This is needed when running in the emulator.</param>
         <summary>The given name is automatically prefixed with the package containing the tests to be run.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Test/MoreAsserts.xml b/docs/Mono.Android/en/Android.Test/MoreAsserts.xml
index 1918a4aeda..682a5aba6b 100644
--- a/docs/Mono.Android/en/Android.Test/MoreAsserts.xml
+++ b/docs/Mono.Android/en/Android.Test/MoreAsserts.xml
@@ -106,12 +106,12 @@
       <Docs>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that class <c>expected</c> is assignable from the class
+        <summary>Asserts that the class  <c>expected</c> is assignable from the object
             <c>actual</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertAssignableFrom(java.lang.Class,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertAssignableFrom(java.lang.Class, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertAssignableFrom(java.lang.Class,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertAssignableFrom(java.lang.Class, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -194,13 +194,13 @@
         <param name="message">To be added.</param>
         <param name="expectedRegex">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Variant of <c>#assertContainsRegex(String,String,String)</c> using a
-            generic message.</summary>
+        <summary>Asserts that <c>expectedRegex</c> matches any substring of <c>actual</c>
+            and fails with <c>message</c> if it does not.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertContainsRegex(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertContainsRegex(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertContainsRegex(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertContainsRegex(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -472,12 +472,12 @@
       </Parameters>
       <Docs>
         <param name="map">To be added.</param>
-        <summary>Variant of <c>#assertEmpty(String, Iterable)</c> using a
-            generic message.</summary>
+        <summary>Variant of <c>#assertEmpty(String, Map)</c> using a generic
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEmpty(java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEmpty(java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEmpty(java.util.Map)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEmpty(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -514,12 +514,11 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="iterable">To be added.</param>
-        <summary>Variant of <c>#assertEmpty(String, Iterable)</c> using a
-            generic message.</summary>
+        <summary>Asserts that <c>iterable</c> is empty.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEmpty(java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEmpty(java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEmpty(java.lang.String,%20java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEmpty(java.lang.String, java.lang.Iterable)</code>.</a>
             </format>
           </para>
           <para>
@@ -556,12 +555,11 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="map">To be added.</param>
-        <summary>Variant of <c>#assertEmpty(String, Iterable)</c> using a
-            generic message.</summary>
+        <summary>Asserts that <c>map</c> is empty.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEmpty(java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEmpty(java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEmpty(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEmpty(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -598,11 +596,12 @@
       <Docs>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element
+            is the same as those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.Object[],%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.Object[], java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -640,11 +639,12 @@
       <Docs>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element equals
+            those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(byte[], byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -686,7 +686,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.util.Set, java.util.Set)</code>.</a>
             </format>
           </para>
           <para>
@@ -723,11 +723,12 @@
       <Docs>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element equals
+            those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(double[],%20double[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(double[], double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -765,11 +766,12 @@
       <Docs>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element equals
+            those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(int[],%20int[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(int[], int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -809,11 +811,12 @@
         <param name="message">To be added.</param>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element
+            is the same as those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.lang.Object[],%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.lang.Object[], java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -853,11 +856,12 @@
         <param name="message">To be added.</param>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element equals
+            those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20byte[],%20byte[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, byte[], byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -940,11 +944,12 @@
         <param name="message">To be added.</param>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element equals
+            those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20double[],%20double[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, double[], double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -984,11 +989,12 @@
         <param name="message">To be added.</param>
         <param name="expected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Asserts that two sets contain the same elements.</summary>
+        <summary>Asserts that array <c>actual</c> is the same size and every element equals
+            those in array <c>expected</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, java.util.Set, java.util.Set)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertEquals(java.lang.String,%20int[],%20int[])" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertEquals(java.lang.String, int[], int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1072,13 +1078,13 @@
         <param name="message">To be added.</param>
         <param name="expectedRegex">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Variant of <c>#assertMatchesRegex(String,String,String)</c> using a
-            generic message.</summary>
+        <summary>Asserts that <c>expectedRegex</c> exactly matches <c>actual</c> and
+            fails with <c>message</c> if it does not.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertMatchesRegex(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertMatchesRegex(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertMatchesRegex(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertMatchesRegex(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1161,12 +1167,12 @@
         <param name="message">To be added.</param>
         <param name="expectedRegex">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Variant of <c>#assertNotContainsRegex(String,String,String)</c> using a
-            generic message.</summary>
+        <summary>Asserts that <c>expectedRegex</c> does not match any substring of
+            <c>actual</c>, and fails with <c>message</c> if it does.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotContainsRegex(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotContainsRegex(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotContainsRegex(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotContainsRegex(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1242,12 +1248,12 @@
       </Parameters>
       <Docs>
         <param name="map">To be added.</param>
-        <summary>Variant of assertNotEmpty(String, Iterable&lt;?&gt;)
-            using a generic message.</summary>
+        <summary>Variant of <c>#assertNotEmpty(String, Map)</c> using a generic
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEmpty(java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEmpty(java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEmpty(java.util.Map)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEmpty(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -1284,12 +1290,11 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="iterable">To be added.</param>
-        <summary>Variant of assertNotEmpty(String, Iterable&lt;?&gt;)
-            using a generic message.</summary>
+        <summary>Asserts that <c>iterable</c> is not empty.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEmpty(java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEmpty(java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEmpty(java.lang.String,%20java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEmpty(java.lang.String, java.lang.Iterable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1326,12 +1331,11 @@
       <Docs>
         <param name="message">To be added.</param>
         <param name="map">To be added.</param>
-        <summary>Variant of assertNotEmpty(String, Iterable&lt;?&gt;)
-            using a generic message.</summary>
+        <summary>Asserts that <c>map</c> is not empty.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEmpty(java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEmpty(java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEmpty(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEmpty(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -1413,12 +1417,12 @@
         <param name="message">To be added.</param>
         <param name="unexpected">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Variant of <c>#assertNotEqual(String,Object,Object)</c> using a
-            generic message.</summary>
+        <summary>Asserts that <c>actual</c> is not equal <c>unexpected</c>, according
+            to both <c>==</c> and <c>Object#equals</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEqual(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEqual(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotEqual(java.lang.String,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotEqual(java.lang.String, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1501,12 +1505,12 @@
         <param name="message">To be added.</param>
         <param name="expectedRegex">To be added.</param>
         <param name="actual">To be added.</param>
-        <summary>Variant of <c>#assertNotMatchesRegex(String,String,String)</c> using a
-            generic message.</summary>
+        <summary>Asserts that <c>expectedRegex</c> does not exactly match <c>actual</c>,
+            and fails with <c>message</c> if it does.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotMatchesRegex(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotMatchesRegex(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#assertNotMatchesRegex(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.assertNotMatchesRegex(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1585,11 +1589,19 @@
         <param name="lhs">An Object for which equals() and hashCode() are to be tested.</param>
         <param name="rhs">As lhs.</param>
         <param name="expectedResult">True if the objects should compare equal,
-   false if not.
-</param>
+              false if not.</param>
         <summary>Utility for testing equals() and hashCode() results at once.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/test/MoreAsserts#checkEqualsAndHashCodeMethods(java.lang.String,%20java.lang.Object,%20java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>android.test.MoreAsserts.checkEqualsAndHashCodeMethods(java.lang.String, java.lang.Object, java.lang.Object, boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Test/RenamingDelegatingContext.xml b/docs/Mono.Android/en/Android.Test/RenamingDelegatingContext.xml
index c752666efa..7f294254f3 100644
--- a/docs/Mono.Android/en/Android.Test/RenamingDelegatingContext.xml
+++ b/docs/Mono.Android/en/Android.Test/RenamingDelegatingContext.xml
@@ -62,7 +62,6 @@
       </Parameters>
       <Docs>
         <param name="context">: the context that will be delegated.</param>
-        <param name="fileContext">: the context that file and db methods will be delegated to</param>
         <param name="filePrefix">: a prefix with which database and file names will be
             prefixed.</param>
         <summary>
@@ -70,7 +69,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/RenamingDelegatingContext#RenamingDelegatingContext(android.content.Context,%20android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.RenamingDelegatingContext.RenamingDelegatingContext(android.content.Context, android.content.Context, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/RenamingDelegatingContext#RenamingDelegatingContext(android.content.Context,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.test.RenamingDelegatingContext.RenamingDelegatingContext(android.content.Context, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Test/ViewAsserts.xml b/docs/Mono.Android/en/Android.Test/ViewAsserts.xml
index 014afe4360..3a413edf09 100644
--- a/docs/Mono.Android/en/Android.Test/ViewAsserts.xml
+++ b/docs/Mono.Android/en/Android.Test/ViewAsserts.xml
@@ -172,16 +172,15 @@
         <Parameter Name="margin" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="margin">The margin between the first view and the second view
-</param>
         <param name="first">The first view</param>
         <param name="second">The second view</param>
+        <param name="margin">The margin between the first view and the second view</param>
         <summary>Assert that two views are bottom aligned, that is that their bottom edges
-            are on the same y location.</summary>
+            are on the same y location, with respect to the specified margin.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertBottomAligned(android.view.View,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertBottomAligned(android.view.View, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertBottomAligned(android.view.View,%20android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertBottomAligned(android.view.View, android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -474,16 +473,15 @@
         <Parameter Name="margin" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="margin">The margin between the first view and the second view
-</param>
         <param name="first">The first view</param>
         <param name="second">The second view</param>
+        <param name="margin">The margin between the first view and the second view</param>
         <summary>Assert that two views are left aligned, that is that their left edges
-            are on the same x location.</summary>
+            are on the same x location, with respect to the specified margin.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertLeftAligned(android.view.View,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertLeftAligned(android.view.View, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertLeftAligned(android.view.View,%20android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertLeftAligned(android.view.View, android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -689,16 +687,15 @@
         <Parameter Name="margin" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="margin">The margin between the first view and the second view
-</param>
         <param name="first">The first view</param>
         <param name="second">The second view</param>
+        <param name="margin">The margin between the first view and the second view</param>
         <summary>Assert that two views are right aligned, that is that their right edges
-            are on the same x location.</summary>
+            are on the same x location, with respect to the specified margin.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertRightAligned(android.view.View,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertRightAligned(android.view.View, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertRightAligned(android.view.View,%20android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertRightAligned(android.view.View, android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -778,16 +775,15 @@
         <Parameter Name="margin" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="margin">The margin between the first view and the second view
-</param>
         <param name="first">The first view</param>
         <param name="second">The second view</param>
+        <param name="margin">The margin between the first view and the second view</param>
         <summary>Assert that two views are top aligned, that is that their top edges
-            are on the same y location.</summary>
+            are on the same y location, with respect to the specified margin.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertTopAligned(android.view.View,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertTopAligned(android.view.View, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/test/ViewAsserts#assertTopAligned(android.view.View,%20android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.test.ViewAsserts.assertTopAligned(android.view.View, android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Format/DateFormat.xml b/docs/Mono.Android/en/Android.Text.Format/DateFormat.xml
index 403c978108..1ef322472f 100644
--- a/docs/Mono.Android/en/Android.Text.Format/DateFormat.xml
+++ b/docs/Mono.Android/en/Android.Text.Format/DateFormat.xml
@@ -228,16 +228,15 @@
         <Parameter Name="inDate" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="inDate">To be added.</param>
         <param name="inFormat">the format string, as described in <c>android.text.format.DateFormat</c></param>
-        <param name="inTimeInMillis">in milliseconds since Jan 1, 1970 GMT</param>
-        <summary>Given a format string and a time in milliseconds since Jan 1, 1970 GMT, returns a
-            CharSequence containing the requested date.</summary>
+        <param name="inDate">the date to format</param>
+        <summary>Given a format string and a <c>java.util.Calendar</c> object, returns a CharSequence
+            containing the requested date.</summary>
         <returns>a <c>CharSequence</c> containing the requested text</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -266,16 +265,15 @@
         <Parameter Name="inDate" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="inDate">To be added.</param>
         <param name="inFormat">the format string, as described in <c>android.text.format.DateFormat</c></param>
-        <param name="inTimeInMillis">in milliseconds since Jan 1, 1970 GMT</param>
-        <summary>Given a format string and a time in milliseconds since Jan 1, 1970 GMT, returns a
-            CharSequence containing the requested date.</summary>
+        <param name="inDate">the date to format</param>
+        <summary>Given a format string and a <c>java.util.Date</c> object, returns a CharSequence containing
+            the requested date.</summary>
         <returns>a <c>CharSequence</c> containing the requested text</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20java.util.Date)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -347,16 +345,15 @@
         <Parameter Name="inDate" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="inDate">the date to format</param>
         <param name="inFormat">the format string, as described in <c>android.text.format.DateFormat</c></param>
-        <param name="inTimeInMillis">in milliseconds since Jan 1, 1970 GMT</param>
-        <summary>Given a format string and a time in milliseconds since Jan 1, 1970 GMT, returns a
-            CharSequence containing the requested date.</summary>
+        <param name="inDate">the date to format</param>
+        <summary>Given a format string and a <c>java.util.Calendar</c> object, returns a CharSequence
+            containing the requested date.</summary>
         <returns>a <c>CharSequence</c> containing the requested text</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -392,16 +389,15 @@
         <Parameter Name="inDate" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="inDate">the date to format</param>
         <param name="inFormat">the format string, as described in <c>android.text.format.DateFormat</c></param>
-        <param name="inTimeInMillis">in milliseconds since Jan 1, 1970 GMT</param>
-        <summary>Given a format string and a time in milliseconds since Jan 1, 1970 GMT, returns a
-            CharSequence containing the requested date.</summary>
+        <param name="inDate">the date to format</param>
+        <summary>Given a format string and a <c>java.util.Date</c> object, returns a CharSequence containing
+            the requested date.</summary>
         <returns>a <c>CharSequence</c> containing the requested text</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateFormat#format(java.lang.CharSequence,%20java.util.Date)" title="Reference documentation">Java documentation for <code>android.text.format.DateFormat.format(java.lang.CharSequence, java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Format/DateUtils.xml b/docs/Mono.Android/en/Android.Text.Format/DateUtils.xml
index 023bba7954..25bd33f11a 100644
--- a/docs/Mono.Android/en/Android.Text.Format/DateUtils.xml
+++ b/docs/Mono.Android/en/Android.Text.Format/DateUtils.xml
@@ -269,10 +269,10 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="formatter">the Formatter used for formatting the date range.
- Note: be sure to call setLength(0) on StringBuilder passed to
- the Formatter constructor unless you want the results to accumulate.</param>
         <param name="context">the context is required only if the time is shown</param>
+        <param name="formatter">the Formatter used for formatting the date range.
+            Note: be sure to call setLength(0) on StringBuilder passed to
+            the Formatter constructor unless you want the results to accumulate.</param>
         <param name="startMillis">the start time in UTC milliseconds</param>
         <param name="endMillis">the end time in UTC milliseconds</param>
         <param name="flags">a bit mask of options See
@@ -282,7 +282,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#formatDateRange(android.content.Context,%20long,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.formatDateRange(android.content.Context, long, long, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#formatDateRange(android.content.Context,%20java.util.Formatter,%20long,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.formatDateRange(android.content.Context, java.util.Formatter, long, long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -329,22 +329,21 @@
         <Parameter Name="timeZone" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="formatter">the Formatter used for formatting the date range.
- Note: be sure to call setLength(0) on StringBuilder passed to
- the Formatter constructor unless you want the results to accumulate.</param>
-        <param name="timeZone">the time zone to compute the string in. Use null for local
- or if the FORMAT_UTC flag is being used.</param>
         <param name="context">the context is required only if the time is shown</param>
+        <param name="formatter">the Formatter used for formatting the date range.
+            Note: be sure to call setLength(0) on StringBuilder passed to
+            the Formatter constructor unless you want the results to accumulate.</param>
         <param name="startMillis">the start time in UTC milliseconds</param>
         <param name="endMillis">the end time in UTC milliseconds</param>
-        <param name="flags">a bit mask of options See
-            <c>#formatDateRange(Context, Formatter, long, long, int, String) formatDateRange</c></param>
+        <param name="flags">a bit mask of options</param>
+        <param name="timeZone">the time zone to compute the string in. Use null for local
+            or if the FORMAT_UTC flag is being used.</param>
         <summary>Formats a date or a time range according to the local conventions.</summary>
-        <returns>a string containing the formatted date/time range.</returns>
+        <returns>the formatter with the formatted date/time range appended to the string buffer.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#formatDateRange(android.content.Context,%20long,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.formatDateRange(android.content.Context, long, long, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#formatDateRange(android.content.Context,%20java.util.Formatter,%20long,%20long,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.formatDateRange(android.content.Context, java.util.Formatter, long, long, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -475,15 +474,16 @@
       </Parameters>
       <Docs>
         <param name="recycle">
-          <see cref="T:Java.Lang.StringBuilder" /> to recycle, or null to use a temporary one.</param>
+          <c>StringBuilder</c> to recycle, or null to use a temporary one.</param>
         <param name="elapsedSeconds">the elapsed time in seconds.</param>
-        <summary>Formats an elapsed time in the form "MM:SS" or "H:MM:SS"
-            for display on the call-in-progress screen.</summary>
+        <summary>Formats an elapsed time in a format like "MM:SS" or "H:MM:SS" (using a form
+            suited to the current locale), similar to that used on the call-in-progress
+            screen.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#formatElapsedTime(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.formatElapsedTime(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#formatElapsedTime(java.lang.StringBuilder,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.formatElapsedTime(java.lang.StringBuilder, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -998,15 +998,15 @@
         <Parameter Name="millis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <param name="millis">To be added.</param>
-        <param name="startTime">some time in the past.</param>
-        <summary>Returns a string describing the elapsed time since startTime.</summary>
-        <returns>a String object containing the elapsed time.</returns>
+        <param name="c">context for resources</param>
+        <param name="millis">time in milliseconds</param>
+        <summary>Convenience function to return relative time string without preposition.</summary>
+        <returns>
+          <c>CharSequence</c> containing relative time.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(android.content.Context,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(android.content.Context, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1038,14 +1038,22 @@
       <Docs>
         <param name="c">To be added.</param>
         <param name="millis">To be added.</param>
-        <param name="withPreposition">To be added.</param>
-        <param name="startTime">some time in the past.</param>
+        <param name="withPreposition">If true, the string returned will include the correct
+            preposition ("at 9:20am", "on 10/12/2008" or "on May 29").</param>
         <summary>Returns a string describing the elapsed time since startTime.</summary>
-        <returns>a String object containing the elapsed time.</returns>
+        <returns>a relative time string to display the time expressed by millis.  Times
+            are counted starting at midnight, which means that assuming that the current
+            time is March 31st, 0:30:
+            &lt;ul&gt;
+              &lt;li&gt;"millis=0:10 today" will be displayed as "0:10"&lt;/li&gt;
+              &lt;li&gt;"millis=11:30pm the day before" will be displayed as "Mar 30"&lt;/li&gt;
+            &lt;/ul&gt;
+            If the given millis is in a different year, then the full date is
+            returned in numeric format (e.g., "10/12/2008").</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(android.content.Context,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(android.content.Context, long, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1075,16 +1083,17 @@
         <Parameter Name="minResolution" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
-        <param name="now">To be added.</param>
-        <param name="minResolution">To be added.</param>
-        <param name="startTime">some time in the past.</param>
-        <summary>Returns a string describing the elapsed time since startTime.</summary>
+        <param name="time">the time to describe, in milliseconds</param>
+        <param name="now">the current time in milliseconds</param>
+        <param name="minResolution">the minimum timespan to report. For example, a time 3 seconds in the
+                past will be reported as "0 minutes ago" if this is set to MINUTE_IN_MILLIS. Pass one of
+                0, MINUTE_IN_MILLIS, HOUR_IN_MILLIS, DAY_IN_MILLIS, WEEK_IN_MILLIS</param>
+        <summary>Returns a string describing 'time' as a time relative to 'now'.</summary>
         <returns>a String object containing the elapsed time.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long, long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1122,17 +1131,22 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
-        <param name="now">To be added.</param>
-        <param name="minResolution">To be added.</param>
-        <param name="flags">To be added.</param>
-        <param name="startTime">some time in the past.</param>
-        <summary>Returns a string describing the elapsed time since startTime.</summary>
+        <param name="time">the time to describe, in milliseconds</param>
+        <param name="now">the current time in milliseconds</param>
+        <param name="minResolution">the minimum timespan to report. For example, a time
+                       3 seconds in the past will be reported as "0 minutes ago" if
+                       this is set to MINUTE_IN_MILLIS. Pass one of 0,
+                       MINUTE_IN_MILLIS, HOUR_IN_MILLIS, DAY_IN_MILLIS,
+                       WEEK_IN_MILLIS</param>
+        <param name="flags">a bit mask of formatting options, such as
+                       <c>#FORMAT_NUMERIC_DATE</c> or
+                       <c>#FORMAT_ABBREV_RELATIVE</c></param>
+        <summary>Returns a string describing 'time' as a time relative to 'now'.</summary>
         <returns>a String object containing the elapsed time.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long,%20long,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long, long, long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1211,13 +1225,13 @@
       <Docs>
         <param name="c">context for resources</param>
         <param name="millis">time in milliseconds</param>
-        <param name="startTime">some time in the past.</param>
-        <summary>Returns a string describing the elapsed time since startTime.</summary>
-        <returns>a String object containing the elapsed time.</returns>
+        <summary>Convenience function to return relative time string without preposition.</summary>
+        <returns>
+          <c>CharSequence</c> containing relative time.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(android.content.Context,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(android.content.Context, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1258,15 +1272,21 @@
         <param name="c">To be added.</param>
         <param name="millis">To be added.</param>
         <param name="withPreposition">If true, the string returned will include the correct
- preposition ("at 9:20am", "on 10/12/2008" or "on May 29").
-</param>
-        <param name="startTime">some time in the past.</param>
+            preposition ("at 9:20am", "on 10/12/2008" or "on May 29").</param>
         <summary>Returns a string describing the elapsed time since startTime.</summary>
-        <returns>a String object containing the elapsed time.</returns>
+        <returns>a relative time string to display the time expressed by millis.  Times
+            are counted starting at midnight, which means that assuming that the current
+            time is March 31st, 0:30:
+            &lt;ul&gt;
+              &lt;li&gt;"millis=0:10 today" will be displayed as "0:10"&lt;/li&gt;
+              &lt;li&gt;"millis=11:30pm the day before" will be displayed as "Mar 30"&lt;/li&gt;
+            &lt;/ul&gt;
+            If the given millis is in a different year, then the full date is
+            returned in numeric format (e.g., "10/12/2008").</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(android.content.Context,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(android.content.Context, long, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1306,16 +1326,14 @@
         <param name="time">the time to describe, in milliseconds</param>
         <param name="now">the current time in milliseconds</param>
         <param name="minResolution">the minimum timespan to report. For example, a time 3 seconds in the
-     past will be reported as "0 minutes ago" if this is set to MINUTE_IN_MILLIS. Pass one of
-     0, MINUTE_IN_MILLIS, HOUR_IN_MILLIS, DAY_IN_MILLIS, WEEK_IN_MILLIS
-</param>
-        <param name="startTime">some time in the past.</param>
-        <summary>Returns a string describing the elapsed time since startTime.</summary>
+                past will be reported as "0 minutes ago" if this is set to MINUTE_IN_MILLIS. Pass one of
+                0, MINUTE_IN_MILLIS, HOUR_IN_MILLIS, DAY_IN_MILLIS, WEEK_IN_MILLIS</param>
+        <summary>Returns a string describing 'time' as a time relative to 'now'.</summary>
         <returns>a String object containing the elapsed time.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long,%20long,%20long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long, long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1363,20 +1381,19 @@
         <param name="time">the time to describe, in milliseconds</param>
         <param name="now">the current time in milliseconds</param>
         <param name="minResolution">the minimum timespan to report. For example, a time
-            3 seconds in the past will be reported as "0 minutes ago" if
-            this is set to MINUTE_IN_MILLIS. Pass one of 0,
-            MINUTE_IN_MILLIS, HOUR_IN_MILLIS, DAY_IN_MILLIS,
-            WEEK_IN_MILLIS</param>
+                       3 seconds in the past will be reported as "0 minutes ago" if
+                       this is set to MINUTE_IN_MILLIS. Pass one of 0,
+                       MINUTE_IN_MILLIS, HOUR_IN_MILLIS, DAY_IN_MILLIS,
+                       WEEK_IN_MILLIS</param>
         <param name="flags">a bit mask of formatting options, such as
-            <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Text Format DateUtils FORMAT_NUMERIC_DATE';scope=Xamarin" title="Android.Text.Format.DateUtils.FORMAT_NUMERIC_DATE">Android.Text.Format.DateUtils.FORMAT_NUMERIC_DATE</a></format> or
-            <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Text Format DateUtils FORMAT_ABBREV_RELATIVE';scope=Xamarin" title="Android.Text.Format.DateUtils.FORMAT_ABBREV_RELATIVE">Android.Text.Format.DateUtils.FORMAT_ABBREV_RELATIVE</a></format></param>
-        <param name="startTime">some time in the past.</param>
-        <summary>Returns a string describing the elapsed time since startTime.</summary>
+                       <c>#FORMAT_NUMERIC_DATE</c> or
+                       <c>#FORMAT_ABBREV_RELATIVE</c></param>
+        <summary>Returns a string describing 'time' as a time relative to 'now'.</summary>
         <returns>a String object containing the elapsed time.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/DateUtils#getRelativeTimeSpanString(long,%20long,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.DateUtils.getRelativeTimeSpanString(long, long, long, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Format/Time.xml b/docs/Mono.Android/en/Android.Text.Format/Time.xml
index de485a2609..f090c8b16c 100644
--- a/docs/Mono.Android/en/Android.Text.Format/Time.xml
+++ b/docs/Mono.Android/en/Android.Text.Format/Time.xml
@@ -141,12 +141,13 @@
         <Parameter Name="timezoneId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="timezoneId">To be added.</param>
-        <summary>Construct a Time object in the default timezone.</summary>
+        <param name="timezoneId">string containing the timezone to use.</param>
+        <summary>Construct a Time object in the timezone named by the string
+            argument "timezone".</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/Time#Time()" title="Reference documentation">Java documentation for <code>android.text.format.Time.Time()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/Time#Time(java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.format.Time.Time(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1354,14 +1355,11 @@
       </Parameters>
       <Docs>
         <param name="that">To be added.</param>
-        <param name="monthDay">the day of the month (in the range [1,31])</param>
-        <param name="month">the zero-based month number (in the range [0,11])</param>
-        <param name="year">the year</param>
-        <summary>Sets the date from the given fields.</summary>
+        <summary>Copy the value of that to this Time object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/Time#set(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.Time.set(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/Time#set(android.text.format.Time)" title="Reference documentation">Java documentation for <code>android.text.format.Time.set(android.text.format.Time)</code>.</a>
             </format>
           </para>
           <para>
@@ -1400,16 +1398,12 @@
         <Parameter Name="millis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="millis">the time in UTC milliseconds since the epoch.
-</param>
-        <param name="monthDay">the day of the month (in the range [1,31])</param>
-        <param name="month">the zero-based month number (in the range [0,11])</param>
-        <param name="year">the year</param>
-        <summary>Sets the date from the given fields.</summary>
+        <param name="millis">the time in UTC milliseconds since the epoch.</param>
+        <summary>Sets the fields in this Time object given the UTC milliseconds.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/Time#set(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.Time.set(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/Time#set(long)" title="Reference documentation">Java documentation for <code>android.text.format.Time.set(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1507,11 +1501,11 @@
         <param name="monthDay">the day of the month (in the range [1,31])</param>
         <param name="month">the zero-based month number (in the range [0,11])</param>
         <param name="year">the year</param>
-        <summary>Sets the date from the given fields.</summary>
+        <summary>Sets the fields.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/format/Time#set(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.Time.set(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/format/Time#set(int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.format.Time.set(int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Method/DateKeyListener.xml b/docs/Mono.Android/en/Android.Text.Method/DateKeyListener.xml
index f1de18c6a8..4dfdc710cc 100644
--- a/docs/Mono.Android/en/Android.Text.Method/DateKeyListener.xml
+++ b/docs/Mono.Android/en/Android.Text.Method/DateKeyListener.xml
@@ -227,12 +227,12 @@
       </Parameters>
       <Docs>
         <param name="locale">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Returns an instance of DateKeyListener appropriate for the given locale.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/DateKeyListener#getInstance()" title="Reference documentation">Java documentation for <code>android.text.method.DateKeyListener.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/DateKeyListener#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>android.text.method.DateKeyListener.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Method/DateTimeKeyListener.xml b/docs/Mono.Android/en/Android.Text.Method/DateTimeKeyListener.xml
index 066578443b..a641a9f1b0 100644
--- a/docs/Mono.Android/en/Android.Text.Method/DateTimeKeyListener.xml
+++ b/docs/Mono.Android/en/Android.Text.Method/DateTimeKeyListener.xml
@@ -227,12 +227,12 @@
       </Parameters>
       <Docs>
         <param name="locale">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Returns an instance of DateTimeKeyListener appropriate for the given locale.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener#getInstance()" title="Reference documentation">Java documentation for <code>android.text.method.DateTimeKeyListener.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>android.text.method.DateTimeKeyListener.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Method/DigitsKeyListener.xml b/docs/Mono.Android/en/Android.Text.Method/DigitsKeyListener.xml
index a475d00a4f..c821c827c2 100644
--- a/docs/Mono.Android/en/Android.Text.Method/DigitsKeyListener.xml
+++ b/docs/Mono.Android/en/Android.Text.Method/DigitsKeyListener.xml
@@ -134,11 +134,12 @@
       <Docs>
         <param name="sign">To be added.</param>
         <param name="decimal">To be added.</param>
-        <summary>Allocates a DigitsKeyListener that accepts the ASCII digits 0 through 9.</summary>
+        <summary>Allocates a DigitsKeyListener that accepts the ASCII digits 0 through 9, plus the ASCII plus
+            or minus sign (only at the beginning) and/or the ASCII period ('.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#DigitsKeyListener()" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.DigitsKeyListener()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#DigitsKeyListener(boolean,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.DigitsKeyListener(boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -266,12 +267,12 @@
       </Parameters>
       <Docs>
         <param name="locale">To be added.</param>
-        <summary>Returns a DigitsKeyListener that accepts the ASCII digits 0 through 9.</summary>
+        <summary>Returns a DigitsKeyListener that accepts the locale-appropriate digits.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance()" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,12 +307,13 @@
       </Parameters>
       <Docs>
         <param name="accepted">To be added.</param>
-        <summary>Returns a DigitsKeyListener that accepts the ASCII digits 0 through 9.</summary>
+        <summary>Returns a DigitsKeyListener that accepts only the characters
+            that appear in the specified String.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance()" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -353,12 +355,13 @@
       <Docs>
         <param name="sign">To be added.</param>
         <param name="decimal">To be added.</param>
-        <summary>Returns a DigitsKeyListener that accepts the ASCII digits 0 through 9.</summary>
+        <summary>Returns a DigitsKeyListener that accepts the ASCII digits 0 through 9, plus the ASCII plus
+            or minus sign (only at the beginning) and/or the ASCII period ('.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance()" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance(boolean,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance(boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -398,12 +401,14 @@
         <param name="locale">To be added.</param>
         <param name="sign">To be added.</param>
         <param name="decimal">To be added.</param>
-        <summary>Returns a DigitsKeyListener that accepts the ASCII digits 0 through 9.</summary>
+        <summary>Returns a DigitsKeyListener that accepts the locale-appropriate digits, plus the
+            locale-appropriate plus or minus sign (only at the beginning) and/or the locale-appropriate
+            decimal separator (only one per field) if specified.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance()" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/DigitsKeyListener#getInstance(java.util.Locale,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.method.DigitsKeyListener.getInstance(java.util.Locale, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Method/MetaKeyKeyListener.xml b/docs/Mono.Android/en/Android.Text.Method/MetaKeyKeyListener.xml
index 670904688b..846f78d4f7 100644
--- a/docs/Mono.Android/en/Android.Text.Method/MetaKeyKeyListener.xml
+++ b/docs/Mono.Android/en/Android.Text.Method/MetaKeyKeyListener.xml
@@ -109,7 +109,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#adjustMetaAfterKeypress(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.adjustMetaAfterKeypress(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#adjustMetaAfterKeypress(android.text.Spannable)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.adjustMetaAfterKeypress(android.text.Spannable)</code>.</a>
             </format>
           </para>
           <para>
@@ -197,9 +197,6 @@
       <Docs>
         <param name="content">To be added.</param>
         <param name="states">To be added.</param>
-        <param name="state">the meta key state</param>
-        <param name="which">meta keys to clear, may be a combination of <c>#META_SHIFT_ON</c>,
-            <c>#META_ALT_ON</c> or <c>#META_SYM_ON</c>.</param>
         <summary>Clears the state of the specified meta key if it is locked.</summary>
         <remarks>
           <para>
@@ -308,9 +305,6 @@
         <param name="view">To be added.</param>
         <param name="content">To be added.</param>
         <param name="states">To be added.</param>
-        <param name="state">the meta key state</param>
-        <param name="which">meta keys to clear, may be a combination of <c>#META_SHIFT_ON</c>,
-            <c>#META_ALT_ON</c> or <c>#META_SYM_ON</c>.</param>
         <summary>Clears the state of the specified meta key if it is locked.</summary>
         <remarks>
           <para>
@@ -399,14 +393,13 @@
       </Parameters>
       <Docs>
         <param name="text">the buffer in which the meta key would have been pressed.</param>
-        <param name="state">the current meta state bits.</param>
         <summary>Gets the state of the meta keys.</summary>
         <returns>an integer in which each bit set to one represents a pressed
                     or locked meta key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -435,15 +428,14 @@
         <Parameter Name="text" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="state">the current meta state bits.</param>
+        <param name="text">the buffer in which the meta key would have been pressed.</param>
         <summary>Gets the state of the meta keys.</summary>
         <returns>an integer in which each bit set to one represents a pressed
                     or locked meta key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -492,8 +484,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="meta">To be added.</param>
         <param name="state">the current meta state bits.</param>
+        <param name="meta">To be added.</param>
         <summary>Gets the state of the meta keys.</summary>
         <returns>an integer in which each bit set to one represents a pressed
                     or locked meta key.</returns>
@@ -542,16 +534,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="text">the buffer in which the meta key would have been pressed.</param>
         <param name="meta">META_SHIFT_ON, META_ALT_ON, META_SYM_ON</param>
-        <param name="state">the current meta state bits.</param>
-        <summary>Gets the state of the meta keys.</summary>
-        <returns>an integer in which each bit set to one represents a pressed
-                    or locked meta key.</returns>
+        <param name="text">the buffer in which the meta key would have been pressed.</param>
+        <summary>Gets the state of a particular meta key.</summary>
+        <returns>0 if inactive, 1 if active, 2 if locked.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -587,16 +577,16 @@
         <Parameter Name="e" Type="Android.Views.KeyEvent" />
       </Parameters>
       <Docs>
-        <param name="text">the buffer in which the meta key would have been pressed.</param>
         <param name="e">the event for which to evaluate the meta state.</param>
-        <param name="state">the current meta state bits.</param>
-        <summary>Gets the state of the meta keys.</summary>
+        <param name="text">the buffer in which the meta key would have been pressed.</param>
+        <param name="event">the event for which to evaluate the meta state.</param>
+        <summary>Gets the state of the meta keys for a specific key event.</summary>
         <returns>an integer in which each bit set to one represents a pressed
                     or locked meta key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence,%20android.view.KeyEvent)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence, android.view.KeyEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -632,16 +622,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="meta">To be added.</param>
-        <param name="state">the current meta state bits.</param>
-        <summary>Gets the state of the meta keys.</summary>
-        <returns>an integer in which each bit set to one represents a pressed
-                    or locked meta key.</returns>
+        <param name="meta">META_SHIFT_ON, META_ALT_ON, META_SYM_ON</param>
+        <param name="text">the buffer in which the meta key would have been pressed.</param>
+        <summary>Gets the state of a particular meta key.</summary>
+        <returns>0 if inactive, 1 if active, 2 if locked.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -670,16 +658,16 @@
         <Parameter Name="e" Type="Android.Views.KeyEvent" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
         <param name="e">To be added.</param>
-        <param name="state">the current meta state bits.</param>
-        <summary>Gets the state of the meta keys.</summary>
+        <param name="text">the buffer in which the meta key would have been pressed.</param>
+        <param name="event">the event for which to evaluate the meta state.</param>
+        <summary>Gets the state of the meta keys for a specific key event.</summary>
         <returns>an integer in which each bit set to one represents a pressed
                     or locked meta key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence,%20android.view.KeyEvent)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence, android.view.KeyEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -722,17 +710,16 @@
         <Parameter Name="e" Type="Android.Views.KeyEvent" />
       </Parameters>
       <Docs>
-        <param name="text">the buffer in which the meta key would have been pressed.</param>
-        <param name="meta">META_SHIFT_ON, META_ALT_ON, META_SYM_ON</param>
         <param name="e">the event for which to evaluate the meta state.</param>
-        <param name="state">the current meta state bits.</param>
-        <summary>Gets the state of the meta keys.</summary>
-        <returns>an integer in which each bit set to one represents a pressed
-                    or locked meta key.</returns>
+        <param name="meta">META_SHIFT_ON, META_ALT_ON, META_SYM_ON</param>
+        <param name="text">the buffer in which the meta key would have been pressed.</param>
+        <param name="event">the event for which to evaluate the meta state.</param>
+        <summary>Gets the state of a particular meta key to use with a particular key event.</summary>
+        <returns>0 if inactive, 1 if active, 2 if locked.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence,%20int,%20android.view.KeyEvent)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence, int, android.view.KeyEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -769,17 +756,16 @@
         <Parameter Name="e" Type="Android.Views.KeyEvent" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="meta">To be added.</param>
         <param name="e">To be added.</param>
-        <param name="state">the current meta state bits.</param>
-        <summary>Gets the state of the meta keys.</summary>
-        <returns>an integer in which each bit set to one represents a pressed
-                    or locked meta key.</returns>
+        <param name="meta">META_SHIFT_ON, META_ALT_ON, META_SYM_ON</param>
+        <param name="text">the buffer in which the meta key would have been pressed.</param>
+        <param name="event">the event for which to evaluate the meta state.</param>
+        <summary>Gets the state of a particular meta key to use with a particular key event.</summary>
+        <returns>0 if inactive, 1 if active, 2 if locked.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#getMetaState(java.lang.CharSequence,%20int,%20android.view.KeyEvent)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.getMetaState(java.lang.CharSequence, int, android.view.KeyEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -1224,7 +1210,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#resetLockedMeta(long)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.resetLockedMeta(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener#resetLockedMeta(android.text.Spannable)" title="Reference documentation">Java documentation for <code>android.text.method.MetaKeyKeyListener.resetLockedMeta(android.text.Spannable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Method/TimeKeyListener.xml b/docs/Mono.Android/en/Android.Text.Method/TimeKeyListener.xml
index 5019d96eec..4385cbddd4 100644
--- a/docs/Mono.Android/en/Android.Text.Method/TimeKeyListener.xml
+++ b/docs/Mono.Android/en/Android.Text.Method/TimeKeyListener.xml
@@ -227,12 +227,12 @@
       </Parameters>
       <Docs>
         <param name="locale">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>Returns an instance of TimeKeyListener appropriate for the given locale.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/method/TimeKeyListener#getInstance()" title="Reference documentation">Java documentation for <code>android.text.method.TimeKeyListener.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/method/TimeKeyListener#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>android.text.method.TimeKeyListener.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml b/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml
index 08c0b87ab8..a65d4023d9 100644
--- a/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/AbsoluteSizeSpan.xml
@@ -70,11 +70,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Set the text size to &lt;code&gt;size&lt;/code&gt; physical pixels.</summary>
+        <summary>Creates an <c>AbsoluteSizeSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan#AbsoluteSizeSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.AbsoluteSizeSpan.AbsoluteSizeSpan(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan#AbsoluteSizeSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.AbsoluteSizeSpan.AbsoluteSizeSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -146,11 +146,12 @@
       <Docs>
         <param name="size">To be added.</param>
         <param name="dip">To be added.</param>
-        <summary>Set the text size to &lt;code&gt;size&lt;/code&gt; physical pixels.</summary>
+        <summary>Set the text size to &lt;code&gt;size&lt;/code&gt; physical pixels, or to &lt;code&gt;size&lt;/code&gt;
+            device-independent pixels if &lt;code&gt;dip&lt;/code&gt; is true.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan#AbsoluteSizeSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.AbsoluteSizeSpan.AbsoluteSizeSpan(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan#AbsoluteSizeSpan(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.style.AbsoluteSizeSpan.AbsoluteSizeSpan(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan.xml b/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan.xml
index 7ea44b29b3..93c0ee310f 100644
--- a/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/BackgroundColorSpan.xml
@@ -110,12 +110,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <param name="color">color integer that defines the background color</param>
-        <summary>Creates a <c>BackgroundColorSpan</c> from a color integer.</summary>
+        <summary>Creates a <c>BackgroundColorSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan#BackgroundColorSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.BackgroundColorSpan.BackgroundColorSpan(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan#BackgroundColorSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.BackgroundColorSpan.BackgroundColorSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/BulletSpan.xml b/docs/Mono.Android/en/Android.Text.Style/BulletSpan.xml
index 266692c7c5..9b00411297 100644
--- a/docs/Mono.Android/en/Android.Text.Style/BulletSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/BulletSpan.xml
@@ -109,11 +109,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Creates a <c>BulletSpan</c> with the default values.</summary>
+        <summary>Creates a <c>BulletSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan()" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -145,12 +145,12 @@
         <Parameter Name="gapWidth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="gapWidth">To be added.</param>
-        <summary>Creates a <c>BulletSpan</c> with the default values.</summary>
+        <param name="gapWidth">the distance, in pixels, between the bullet point and the paragraph.</param>
+        <summary>Creates a <c>BulletSpan</c> based on a gap width</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan()" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -183,13 +183,13 @@
         <Parameter Name="color" Type="Android.Graphics.Color" />
       </Parameters>
       <Docs>
-        <param name="gapWidth">To be added.</param>
-        <param name="color">To be added.</param>
-        <summary>Creates a <c>BulletSpan</c> with the default values.</summary>
+        <param name="gapWidth">the distance, in pixels, between the bullet point and the paragraph.</param>
+        <param name="color">the bullet point color, as a color integer</param>
+        <summary>Creates a <c>BulletSpan</c> based on a gap width and a color integer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan()" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan(int,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -246,14 +246,14 @@
         <Parameter Name="bulletRadius" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="gapWidth">To be added.</param>
-        <param name="color">To be added.</param>
-        <param name="bulletRadius">To be added.</param>
-        <summary>Creates a <c>BulletSpan</c> with the default values.</summary>
+        <param name="gapWidth">the distance, in pixels, between the bullet point and the paragraph.</param>
+        <param name="color">the bullet point color, as a color integer.</param>
+        <param name="bulletRadius">the radius of the bullet point, in pixels.</param>
+        <summary>Creates a <c>BulletSpan</c> based on a gap width and a color integer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan()" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/BulletSpan#BulletSpan(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.BulletSpan.BulletSpan(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/DrawableMarginSpan.xml b/docs/Mono.Android/en/Android.Text.Style/DrawableMarginSpan.xml
index 2d773531f5..f370d695e2 100644
--- a/docs/Mono.Android/en/Android.Text.Style/DrawableMarginSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/DrawableMarginSpan.xml
@@ -113,13 +113,13 @@
         <Parameter Name="pad" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pad">To be added.</param>
         <param name="drawable">the drawable to be added</param>
-        <summary>Creates a <c>DrawableMarginSpan</c> from a <c>Drawable</c>.</summary>
+        <param name="pad">the distance between the drawable and the text</param>
+        <summary>Creates a <c>DrawableMarginSpan</c> from a <c>Drawable</c> and a padding, in pixels.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan#DrawableMarginSpan(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.text.style.DrawableMarginSpan.DrawableMarginSpan(android.graphics.drawable.Drawable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan#DrawableMarginSpan(android.graphics.drawable.Drawable,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.DrawableMarginSpan.DrawableMarginSpan(android.graphics.drawable.Drawable, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/DynamicDrawableSpan.xml b/docs/Mono.Android/en/Android.Text.Style/DynamicDrawableSpan.xml
index a3f76dc929..57f2a3ce03 100644
--- a/docs/Mono.Android/en/Android.Text.Style/DynamicDrawableSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/DynamicDrawableSpan.xml
@@ -95,12 +95,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="verticalAlignment">To be added.</param>
-        <summary>Creates a <c>DynamicDrawableSpan</c>.</summary>
+        <param name="verticalAlignment">one of <c>#ALIGN_BOTTOM</c>, <c>#ALIGN_BASELINE</c> or
+                                     <c>#ALIGN_CENTER</c></param>
+        <summary>Creates a <c>DynamicDrawableSpan</c> based on a vertical alignment.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/DynamicDrawableSpan#DynamicDrawableSpan()" title="Reference documentation">Java documentation for <code>android.text.style.DynamicDrawableSpan.DynamicDrawableSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/DynamicDrawableSpan#DynamicDrawableSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.DynamicDrawableSpan.DynamicDrawableSpan(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan.xml b/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan.xml
index 05505153ca..19e4b886b9 100644
--- a/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/EasyEditSpan.xml
@@ -103,12 +103,14 @@
         <Parameter Name="pendingIntent" Type="Android.App.PendingIntent" />
       </Parameters>
       <Docs>
-        <param name="pendingIntent">To be added.</param>
+        <param name="pendingIntent">The intent will be sent when the wrapped text is deleted or modified.
+                                 When the pending intent is sent, <c>#EXTRA_TEXT_CHANGED_TYPE</c> is
+                                 added in the intent to describe how the text changed.</param>
         <summary>Creates the span.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/EasyEditSpan#EasyEditSpan()" title="Reference documentation">Java documentation for <code>android.text.style.EasyEditSpan.EasyEditSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/EasyEditSpan#EasyEditSpan(android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.text.style.EasyEditSpan.EasyEditSpan(android.app.PendingIntent)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,11 +143,11 @@
       </Parameters>
       <Docs>
         <param name="source">To be added.</param>
-        <summary>Creates the span.</summary>
+        <summary>Constructor called from <c>TextUtils</c> to restore the span.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/EasyEditSpan#EasyEditSpan()" title="Reference documentation">Java documentation for <code>android.text.style.EasyEditSpan.EasyEditSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/EasyEditSpan#EasyEditSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.EasyEditSpan.EasyEditSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan.xml b/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan.xml
index 07c457750b..ffc2159583 100644
--- a/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/ForegroundColorSpan.xml
@@ -110,12 +110,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <param name="color">color integer that defines the text color</param>
-        <summary>Creates a <c>ForegroundColorSpan</c> from a color integer.</summary>
+        <summary>Creates a <c>ForegroundColorSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan#ForegroundColorSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.ForegroundColorSpan.ForegroundColorSpan(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan#ForegroundColorSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.ForegroundColorSpan.ForegroundColorSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/IconMarginSpan.xml b/docs/Mono.Android/en/Android.Text.Style/IconMarginSpan.xml
index a6280f3731..6f3eacb0dc 100644
--- a/docs/Mono.Android/en/Android.Text.Style/IconMarginSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/IconMarginSpan.xml
@@ -113,13 +113,13 @@
         <Parameter Name="pad" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pad">To be added.</param>
         <param name="bitmap">bitmap to be rendered at the beginning of the text</param>
+        <param name="pad">padding width, in pixels, between the bitmap and the text</param>
         <summary>Creates an <c>IconMarginSpan</c> from a <c>Bitmap</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/IconMarginSpan#IconMarginSpan(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.text.style.IconMarginSpan.IconMarginSpan(android.graphics.Bitmap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/IconMarginSpan#IconMarginSpan(android.graphics.Bitmap,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.IconMarginSpan.IconMarginSpan(android.graphics.Bitmap, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml b/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml
index ed651ca29a..ee52f980a0 100644
--- a/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/ImageSpan.xml
@@ -59,14 +59,12 @@
       </Parameters>
       <Docs>
         <param name="b">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
         <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
             alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.graphics.Bitmap)</code>.</a>
             </format>
           </para>
           <para>
@@ -98,15 +96,13 @@
         <Parameter Name="drawable" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
-        <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
-            alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
+        <param name="drawable">drawable to be rendered</param>
+        <summary>Constructs an <c>ImageSpan</c> from a drawable with the default
+            alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -139,9 +135,8 @@
         <Parameter Name="bitmap" Type="Android.Graphics.Bitmap" />
       </Parameters>
       <Docs>
-        <param name="bitmap">To be added.</param>
         <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
+        <param name="bitmap">To be added.</param>
         <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
             alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
         <remarks>
@@ -180,9 +175,8 @@
         <Parameter Name="uri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
         <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
+        <param name="uri">To be added.</param>
         <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
             alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
         <remarks>
@@ -274,14 +268,12 @@
       <Docs>
         <param name="b">To be added.</param>
         <param name="verticalAlignment">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
         <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
             alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.graphics.Bitmap,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.graphics.Bitmap, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -321,16 +313,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="verticalAlignment">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
-        <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
-            alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
+        <param name="drawable">drawable to be rendered</param>
+        <param name="verticalAlignment">one of <c>DynamicDrawableSpan#ALIGN_BOTTOM</c> or
+                                     <c>DynamicDrawableSpan#ALIGN_BASELINE</c></param>
+        <summary>Constructs an <c>ImageSpan</c> from a drawable and a vertical alignment.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.graphics.drawable.Drawable,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.graphics.drawable.Drawable, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -363,16 +353,14 @@
         <Parameter Name="source" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="source">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
-        <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
+        <param name="drawable">drawable to be rendered</param>
+        <param name="source">drawable's Uri source</param>
+        <summary>Constructs an <c>ImageSpan</c> from a drawable and a source with the default
             alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.graphics.drawable.Drawable,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.graphics.drawable.Drawable, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -436,10 +424,9 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="context">context used to retrieve the drawable from resources</param>
         <param name="bitmap">To be added.</param>
         <param name="verticalAlignment">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
         <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
             alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
         <remarks>
@@ -486,10 +473,9 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="context">context used to retrieve the drawable from resources</param>
         <param name="uri">To be added.</param>
         <param name="verticalAlignment">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
         <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
             alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
         <remarks>
@@ -536,15 +522,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="verticalAlignment">To be added.</param>
         <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
-        <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
-            alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
+        <param name="resourceId">drawable resource id based on which the drawable is retrieved.</param>
+        <param name="verticalAlignment">one of <c>DynamicDrawableSpan#ALIGN_BOTTOM</c> or
+                                     <c>DynamicDrawableSpan#ALIGN_BASELINE</c></param>
+        <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c>, a resource id and a vertical
+            alignment.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -585,17 +572,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="source">To be added.</param>
-        <param name="verticalAlignment">To be added.</param>
-        <param name="context">context used to retrieve the drawable from resources</param>
-        <param name="resourceId">drawable resource id based on which the drawable is retrieved</param>
-        <summary>Constructs an <c>ImageSpan</c> from a <c>Context</c> and a resource id with the default
-            alignment <c>DynamicDrawableSpan#ALIGN_BOTTOM</c></summary>
+        <param name="drawable">drawable to be rendered</param>
+        <param name="source">drawable's uri source</param>
+        <param name="verticalAlignment">one of <c>DynamicDrawableSpan#ALIGN_BOTTOM</c> or
+                                     <c>DynamicDrawableSpan#ALIGN_BASELINE</c></param>
+        <summary>Constructs an <c>ImageSpan</c> from a drawable, a source and a vertical alignment.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/ImageSpan#ImageSpan(android.graphics.drawable.Drawable,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.ImageSpan.ImageSpan(android.graphics.drawable.Drawable, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/LocaleSpan.xml b/docs/Mono.Android/en/Android.Text.Style/LocaleSpan.xml
index f818315a5d..297b8a1a9b 100644
--- a/docs/Mono.Android/en/Android.Text.Style/LocaleSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/LocaleSpan.xml
@@ -107,7 +107,6 @@
       </Parameters>
       <Docs>
         <param name="source">To be added.</param>
-        <param name="locales">The <c>LocaleList</c> of the text to which the span is attached.</param>
         <summary>Creates a <c>LocaleSpan</c> from <c>LocaleList</c>.</summary>
         <remarks>
           <para>
@@ -144,13 +143,12 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
-        <param name="locales">The <c>LocaleList</c> of the text to which the span is attached.</param>
-        <summary>Creates a <c>LocaleSpan</c> from <c>LocaleList</c>.</summary>
+        <param name="locale">The <c>Locale</c> of the text to which the span is attached.</param>
+        <summary>Creates a <c>LocaleSpan</c> from a well-formed <c>Locale</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/LocaleSpan#LocaleSpan(android.os.LocaleList)" title="Reference documentation">Java documentation for <code>android.text.style.LocaleSpan.LocaleSpan(android.os.LocaleList)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/LocaleSpan#LocaleSpan(java.util.Locale)" title="Reference documentation">Java documentation for <code>android.text.style.LocaleSpan.LocaleSpan(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/QuoteSpan.xml b/docs/Mono.Android/en/Android.Text.Style/QuoteSpan.xml
index d7844c69d3..93c51a6223 100644
--- a/docs/Mono.Android/en/Android.Text.Style/QuoteSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/QuoteSpan.xml
@@ -109,12 +109,12 @@
         <Parameter Name="color" Type="Android.Graphics.Color" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <summary>Creates a <c>QuoteSpan</c> with the default values.</summary>
+        <param name="color">the color of the quote stripe.</param>
+        <summary>Creates a <c>QuoteSpan</c> based on a color.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/QuoteSpan#QuoteSpan()" title="Reference documentation">Java documentation for <code>android.text.style.QuoteSpan.QuoteSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/QuoteSpan#QuoteSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.QuoteSpan.QuoteSpan(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -147,11 +147,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Creates a <c>QuoteSpan</c> with the default values.</summary>
+        <summary>Create a <c>QuoteSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/QuoteSpan#QuoteSpan()" title="Reference documentation">Java documentation for <code>android.text.style.QuoteSpan.QuoteSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/QuoteSpan#QuoteSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.QuoteSpan.QuoteSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -208,14 +208,15 @@
         <Parameter Name="gapWidth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="color">To be added.</param>
-        <param name="stripeWidth">To be added.</param>
-        <param name="gapWidth">To be added.</param>
-        <summary>Creates a <c>QuoteSpan</c> with the default values.</summary>
+        <param name="color">the color of the quote stripe.</param>
+        <param name="stripeWidth">the width of the stripe.</param>
+        <param name="gapWidth">the width of the gap between the stripe and the text.</param>
+        <summary>Creates a <c>QuoteSpan</c> based on a color, a stripe width and the width of the gap
+            between the stripe and the text.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/QuoteSpan#QuoteSpan()" title="Reference documentation">Java documentation for <code>android.text.style.QuoteSpan.QuoteSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/QuoteSpan#QuoteSpan(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.QuoteSpan.QuoteSpan(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan.xml b/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan.xml
index bcae150752..7225a0291c 100644
--- a/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/RelativeSizeSpan.xml
@@ -70,12 +70,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <param name="proportion">the proportion with which the text is scaled.</param>
-        <summary>Creates a <c>RelativeSizeSpan</c> based on a proportion.</summary>
+        <summary>Creates a <c>RelativeSizeSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan#RelativeSizeSpan(float)" title="Reference documentation">Java documentation for <code>android.text.style.RelativeSizeSpan.RelativeSizeSpan(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan#RelativeSizeSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.RelativeSizeSpan.RelativeSizeSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan.xml b/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan.xml
index 96bef74c5b..3db0a8d7f3 100644
--- a/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/ScaleXSpan.xml
@@ -70,10 +70,18 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>
-        </summary>
+        <summary>Creates a <c>ScaleXSpan</c> from a parcel.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/text/style/ScaleXSpan#ScaleXSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.ScaleXSpan.ScaleXSpan(android.os.Parcel)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 3" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan.xml b/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan.xml
index 8876f119de..bac6de33c0 100644
--- a/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/StrikethroughSpan.xml
@@ -106,11 +106,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Creates a <c>StrikethroughSpan</c>.</summary>
+        <summary>Creates a <c>StrikethroughSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/StrikethroughSpan#StrikethroughSpan()" title="Reference documentation">Java documentation for <code>android.text.style.StrikethroughSpan.StrikethroughSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/StrikethroughSpan#StrikethroughSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.StrikethroughSpan.StrikethroughSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/StyleSpan.xml b/docs/Mono.Android/en/Android.Text.Style/StyleSpan.xml
index 610170de1d..bb4c2fce29 100644
--- a/docs/Mono.Android/en/Android.Text.Style/StyleSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/StyleSpan.xml
@@ -116,15 +116,12 @@
         <Parameter Name="src" Type="Android.OS.Parcel" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="style">An integer constant describing the style for this span. Examples
-                         include bold, italic, and normal. Values are constants defined
-                         in <c>Typeface</c>.</param>
-        <summary>Creates a <c>StyleSpan</c> from a style.</summary>
+        <param name="src">the parcel</param>
+        <summary>Creates a <c>StyleSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/StyleSpan#StyleSpan(int)" title="Reference documentation">Java documentation for <code>android.text.style.StyleSpan.StyleSpan(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/StyleSpan#StyleSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.StyleSpan.StyleSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan.xml b/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan.xml
index 9917816517..d07f48ca42 100644
--- a/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/SubscriptSpan.xml
@@ -103,11 +103,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Creates a <c>SubscriptSpan</c>.</summary>
+        <summary>Creates a <c>SubscriptSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/SubscriptSpan#SubscriptSpan()" title="Reference documentation">Java documentation for <code>android.text.style.SubscriptSpan.SubscriptSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/SubscriptSpan#SubscriptSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.SubscriptSpan.SubscriptSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan.xml b/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan.xml
index e50bde633f..fe9575f7be 100644
--- a/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/SuggestionSpan.xml
@@ -71,15 +71,6 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <param name="context">Context for the application</param>
-        <param name="locale">locale Locale of the suggestions</param>
-        <param name="suggestions">Suggestions for the string under the span. Only the first up to
-            <c>SuggestionSpan#SUGGESTIONS_MAX_SIZE</c> will be considered. Null values not permitted.</param>
-        <param name="flags">Additional flags indicating how this span is handled in TextView</param>
-        <param name="notificationTargetClass">if not null, this class will get notified when the user
-                                           selects one of the suggestions.  On Android
-                                           <c>android.os.Build.VERSION_CODES#Q</c> and later this
-                                           parameter is always ignored.</param>
         <summary>
         </summary>
         <remarks>
@@ -150,20 +141,14 @@
       </Parameters>
       <Docs>
         <param name="context">Context for the application</param>
-        <param name="locale">locale Locale of the suggestions</param>
-        <param name="suggestions">Suggestions for the string under the span. Only the first up to
-            <c>SuggestionSpan#SUGGESTIONS_MAX_SIZE</c> will be considered. Null values not permitted.</param>
+        <param name="suggestions">Suggestions for the string under the span</param>
         <param name="flags">Additional flags indicating how this span is handled in TextView</param>
-        <param name="notificationTargetClass">if not null, this class will get notified when the user
-                                           selects one of the suggestions.  On Android
-                                           <c>android.os.Build.VERSION_CODES#Q</c> and later this
-                                           parameter is always ignored.</param>
         <summary>
         </summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/SuggestionSpan#SuggestionSpan(android.content.Context,%20java.util.Locale,%20java.lang.String[],%20int,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.text.style.SuggestionSpan.SuggestionSpan(android.content.Context, java.util.Locale, java.lang.String[], int, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/SuggestionSpan#SuggestionSpan(android.content.Context,%20java.lang.String[],%20int)" title="Reference documentation">Java documentation for <code>android.text.style.SuggestionSpan.SuggestionSpan(android.content.Context, java.lang.String[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -204,21 +189,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="context">Context for the application</param>
-        <param name="locale">locale Locale of the suggestions</param>
-        <param name="suggestions">Suggestions for the string under the span. Only the first up to
-            <c>SuggestionSpan#SUGGESTIONS_MAX_SIZE</c> will be considered. Null values not permitted.</param>
+        <param name="locale">Locale of the suggestions</param>
+        <param name="suggestions">Suggestions for the string under the span</param>
         <param name="flags">Additional flags indicating how this span is handled in TextView</param>
-        <param name="notificationTargetClass">if not null, this class will get notified when the user
-                                           selects one of the suggestions.  On Android
-                                           <c>android.os.Build.VERSION_CODES#Q</c> and later this
-                                           parameter is always ignored.</param>
         <summary>
         </summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/SuggestionSpan#SuggestionSpan(android.content.Context,%20java.util.Locale,%20java.lang.String[],%20int,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>android.text.style.SuggestionSpan.SuggestionSpan(android.content.Context, java.util.Locale, java.lang.String[], int, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/SuggestionSpan#SuggestionSpan(java.util.Locale,%20java.lang.String[],%20int)" title="Reference documentation">Java documentation for <code>android.text.style.SuggestionSpan.SuggestionSpan(java.util.Locale, java.lang.String[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan.xml b/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan.xml
index 1db25a2596..b7f5961691 100644
--- a/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/SuperscriptSpan.xml
@@ -103,11 +103,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Creates a <c>SuperscriptSpan</c>.</summary>
+        <summary>Creates a <c>SuperscriptSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/SuperscriptSpan#SuperscriptSpan()" title="Reference documentation">Java documentation for <code>android.text.style.SuperscriptSpan.SuperscriptSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/SuperscriptSpan#SuperscriptSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.SuperscriptSpan.SuperscriptSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml b/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml
index 72a430c9c9..91780e8382 100644
--- a/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/TextAppearanceSpan.xml
@@ -174,11 +174,12 @@
         <param name="appearance">To be added.</param>
         <param name="colorList">To be added.</param>
         <summary>Uses the specified TextAppearance resource to determine the
-            text appearance.</summary>
+            text appearance, and the specified text color resource
+            to determine the color.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan#TextAppearanceSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.TextAppearanceSpan.TextAppearanceSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan#TextAppearanceSpan(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.TextAppearanceSpan.TextAppearanceSpan(android.content.Context, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -226,12 +227,12 @@
         <param name="size">To be added.</param>
         <param name="color">To be added.</param>
         <param name="linkColor">To be added.</param>
-        <summary>Uses the specified TextAppearance resource to determine the
-            text appearance.</summary>
+        <summary>Makes text be drawn with the specified typeface, size, style,
+            and colors.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan#TextAppearanceSpan(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.text.style.TextAppearanceSpan.TextAppearanceSpan(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan#TextAppearanceSpan(java.lang.String,%20int,%20int,%20android.content.res.ColorStateList,%20android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.text.style.TextAppearanceSpan.TextAppearanceSpan(java.lang.String, int, int, android.content.res.ColorStateList, android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan.xml b/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan.xml
index 9bcc56e2ed..5f3dc4ed5a 100644
--- a/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/TypefaceSpan.xml
@@ -107,12 +107,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <param name="typeface">the typeface</param>
-        <summary>Constructs a <c>TypefaceSpan</c> from a <c>Typeface</c>.</summary>
+        <summary>Constructs a <c>TypefaceSpan</c> from a  parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/TypefaceSpan#TypefaceSpan(android.graphics.Typeface)" title="Reference documentation">Java documentation for <code>android.text.style.TypefaceSpan.TypefaceSpan(android.graphics.Typeface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/TypefaceSpan#TypefaceSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.TypefaceSpan.TypefaceSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -144,13 +143,13 @@
         <Parameter Name="family" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="family">To be added.</param>
-        <param name="typeface">the typeface</param>
-        <summary>Constructs a <c>TypefaceSpan</c> from a <c>Typeface</c>.</summary>
+        <param name="family">The font family for this typeface.  Examples include
+                          "monospace", "serif", and "sans-serif"</param>
+        <summary>Constructs a <c>TypefaceSpan</c> based on the font family.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/TypefaceSpan#TypefaceSpan(android.graphics.Typeface)" title="Reference documentation">Java documentation for <code>android.text.style.TypefaceSpan.TypefaceSpan(android.graphics.Typeface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/TypefaceSpan#TypefaceSpan(java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.style.TypefaceSpan.TypefaceSpan(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/URLSpan.xml b/docs/Mono.Android/en/Android.Text.Style/URLSpan.xml
index 742ae66f1b..33de28a84c 100644
--- a/docs/Mono.Android/en/Android.Text.Style/URLSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/URLSpan.xml
@@ -106,12 +106,12 @@
         <Parameter Name="url" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="url">To be added.</param>
-        <summary>Constructs a <c>URLSpan</c> from a parcel.</summary>
+        <param name="url">the url string</param>
+        <summary>Constructs a <c>URLSpan</c> from a url string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/URLSpan#URLSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.URLSpan.URLSpan(android.os.Parcel)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/URLSpan#URLSpan(java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.style.URLSpan.URLSpan(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan.xml b/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan.xml
index 85ae8fe423..f130927973 100644
--- a/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan.xml
+++ b/docs/Mono.Android/en/Android.Text.Style/UnderlineSpan.xml
@@ -106,11 +106,11 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>Creates an <c>UnderlineSpan</c>.</summary>
+        <summary>Creates an <c>UnderlineSpan</c> from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/style/UnderlineSpan#UnderlineSpan()" title="Reference documentation">Java documentation for <code>android.text.style.UnderlineSpan.UnderlineSpan()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/style/UnderlineSpan#UnderlineSpan(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.text.style.UnderlineSpan.UnderlineSpan(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text.Util/Linkify.xml b/docs/Mono.Android/en/Android.Text.Util/Linkify.xml
index 1c6004a588..1829872c8b 100644
--- a/docs/Mono.Android/en/Android.Text.Util/Linkify.xml
+++ b/docs/Mono.Android/en/Android.Text.Util/Linkify.xml
@@ -165,15 +165,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="text">Spannable whose text is to be marked-up with links</param>
+        <param name="text">TextView whose text is to be marked-up with links</param>
         <param name="mask">Mask to define which kinds of links will be searched.</param>
-        <summary>Scans the text of the provided Spannable and turns all occurrences
-             of the link types indicated in the mask into clickable links.</summary>
+        <summary>Scans the text of the provided TextView and turns all occurrences of
+             the link types indicated in the mask into clickable links.</summary>
         <returns>True if at least one link is found and applied.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.text.Spannable,%20int)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.text.Spannable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.widget.TextView,%20int)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.widget.TextView, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -217,16 +217,16 @@
         <Parameter Name="urlSpanFactory" Type="Java.Util.Functions.IFunction" />
       </Parameters>
       <Docs>
-        <param name="urlSpanFactory">To be added.</param>
         <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
+        <param name="mask">mask to define which kinds of links will be searched</param>
+        <param name="urlSpanFactory">function used to create <c>URLSpan</c>s</param>
         <summary>Scans the text of the provided Spannable and turns all occurrences
              of the link types indicated in the mask into clickable links.</summary>
         <returns>True if at least one link is found and applied.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.text.Spannable,%20int)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.text.Spannable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.text.Spannable,%20int,%20java.util.function.Function)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.text.Spannable, int, java.util.function.Function)</code>.</a>
             </format>
           </para>
           <para>
@@ -262,20 +262,17 @@
         <Parameter Name="scheme" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pattern">Regex pattern to be used for finding links</param>
-        <param name="scheme">Url scheme string (eg <c>http://</c> to be
-                      prepended to the url of links that do not have
-                      a scheme specified in the link text
-</param>
         <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
-        <summary>Scans the text of the provided Spannable and turns all occurrences
-             of the link types indicated in the mask into clickable links.</summary>
+        <param name="pattern">Regex pattern to be used for finding links</param>
+        <param name="scheme">URL scheme string (eg &lt;code&gt;http://&lt;/code&gt;) to be
+                                 prepended to the links that do not start with this scheme.</param>
+        <summary>Applies a regex to a Spannable turning the matches into
+             links.</summary>
         <returns>True if at least one link is found and applied.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.text.Spannable,%20int)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.text.Spannable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.text.Spannable,%20java.util.regex.Pattern,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -312,20 +309,17 @@
         <Parameter Name="scheme" Type="System.String" />
       </Parameters>
       <Docs>
+        <param name="text">TextView whose text is to be marked-up with links</param>
         <param name="pattern">Regex pattern to be used for finding links</param>
-        <param name="scheme">Url scheme string (eg <c>http://</c> to be
-                      prepended to the url of links that do not have
-                      a scheme specified in the link text
-</param>
-        <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
-        <summary>Scans the text of the provided Spannable and turns all occurrences
-             of the link types indicated in the mask into clickable links.</summary>
+        <param name="scheme">URL scheme string (eg &lt;code&gt;http://&lt;/code&gt;) to be
+                                 prepended to the links that do not start with this scheme.</param>
+        <summary>Applies a regex to the text of a TextView turning the matches into
+             links.</summary>
         <returns>True if at least one link is found and applied.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.text.Spannable,%20int)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.text.Spannable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/util/Linkify#addLinks(android.widget.TextView,%20java.util.regex.Pattern,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.util.Linkify.addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -374,8 +368,6 @@
                       to be converted into links.
 </param>
         <param name="transformFilter">To be added.</param>
-        <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
         <summary>Scans the text of the provided Spannable and turns all occurrences
              of the link types indicated in the mask into clickable links.</summary>
         <returns>True if at least one link is found and applied.</returns>
@@ -421,6 +413,7 @@
         <Parameter Name="transformFilter" Type="Android.Text.Util.Linkify+ITransformFilter" />
       </Parameters>
       <Docs>
+        <param name="text">Spannable whose text is to be marked-up with links</param>
         <param name="pattern">To be added.</param>
         <param name="scheme">Url scheme string (eg <c>http://</c> to be
                       prepended to the url of links that do not have
@@ -430,8 +423,6 @@
                       to be converted into links.
 </param>
         <param name="transformFilter">To be added.</param>
-        <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
         <summary>Scans the text of the provided Spannable and turns all occurrences
              of the link types indicated in the mask into clickable links.</summary>
         <returns>True if at least one link is found and applied.</returns>
@@ -484,8 +475,6 @@
         <param name="schemes">To be added.</param>
         <param name="matchFilter">To be added.</param>
         <param name="transformFilter">To be added.</param>
-        <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
         <summary>Scans the text of the provided Spannable and turns all occurrences
              of the link types indicated in the mask into clickable links.</summary>
         <returns>True if at least one link is found and applied.</returns>
@@ -531,13 +520,12 @@
         <Parameter Name="transformFilter" Type="Android.Text.Util.Linkify+ITransformFilter" />
       </Parameters>
       <Docs>
+        <param name="text">Spannable whose text is to be marked-up with links</param>
         <param name="pattern">To be added.</param>
         <param name="defaultScheme">To be added.</param>
         <param name="schemes">To be added.</param>
         <param name="matchFilter">To be added.</param>
         <param name="transformFilter">To be added.</param>
-        <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
         <summary>Scans the text of the provided Spannable and turns all occurrences
              of the link types indicated in the mask into clickable links.</summary>
         <returns>True if at least one link is found and applied.</returns>
@@ -591,8 +579,6 @@
         <param name="matchFilter">To be added.</param>
         <param name="transformFilter">To be added.</param>
         <param name="urlSpanFactory">To be added.</param>
-        <param name="text">Spannable whose text is to be marked-up with links</param>
-        <param name="mask">Mask to define which kinds of links will be searched.</param>
         <summary>Scans the text of the provided Spannable and turns all occurrences
              of the link types indicated in the mask into clickable links.</summary>
         <returns>True if at least one link is found and applied.</returns>
diff --git a/docs/Mono.Android/en/Android.Text.Util/Rfc822Tokenizer.xml b/docs/Mono.Android/en/Android.Text.Util/Rfc822Tokenizer.xml
index a52e4801ca..087a8eeba4 100644
--- a/docs/Mono.Android/en/Android.Text.Util/Rfc822Tokenizer.xml
+++ b/docs/Mono.Android/en/Android.Text.Util/Rfc822Tokenizer.xml
@@ -539,12 +539,12 @@
       <Docs>
         <param name="text">To be added.</param>
         <param name="out">To be added.</param>
-        <summary>This method will try to take a string like
+        <summary>This constructor will try to take a string like
             "Foo Bar (something) &amp;lt;foo\</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/util/Rfc822Tokenizer#tokenize(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.util.Rfc822Tokenizer.tokenize(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/util/Rfc822Tokenizer#tokenize(java.lang.CharSequence,%20java.util.Collection)" title="Reference documentation">Java documentation for <code>android.text.util.Rfc822Tokenizer.tokenize(java.lang.CharSequence, java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -575,12 +575,12 @@
       <Docs>
         <param name="text">To be added.</param>
         <param name="out">To be added.</param>
-        <summary>This method will try to take a string like
+        <summary>This constructor will try to take a string like
             "Foo Bar (something) &amp;lt;foo\</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/util/Rfc822Tokenizer#tokenize(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.util.Rfc822Tokenizer.tokenize(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/util/Rfc822Tokenizer#tokenize(java.lang.CharSequence,%20java.util.Collection)" title="Reference documentation">Java documentation for <code>android.text.util.Rfc822Tokenizer.tokenize(java.lang.CharSequence, java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/AutoText.xml b/docs/Mono.Android/en/Android.Text/AutoText.xml
index 7d71090851..3577d64a2d 100644
--- a/docs/Mono.Android/en/Android.Text/AutoText.xml
+++ b/docs/Mono.Android/en/Android.Text/AutoText.xml
@@ -170,12 +170,12 @@
       </Parameters>
       <Docs>
         <param name="view">used to retrieve the current Locale and Resources.</param>
-        <summary>Returns the size of the dictionary.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns the size of the auto text dictionary.</summary>
+        <returns>the number of entries in the auto text dictionary</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/AutoText#getSize()" title="Reference documentation">Java documentation for <code>android.text.AutoText.getSize()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/AutoText#getSize(android.view.View)" title="Reference documentation">Java documentation for <code>android.text.AutoText.getSize(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/BidiFormatter.xml b/docs/Mono.Android/en/Android.Text/BidiFormatter.xml
index bcce046dd7..714664745d 100644
--- a/docs/Mono.Android/en/Android.Text/BidiFormatter.xml
+++ b/docs/Mono.Android/en/Android.Text/BidiFormatter.xml
@@ -58,14 +58,13 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">The context locale.
-</param>
-        <summary>Factory for creating an instance of BidiFormatter for the default locale directionality.</summary>
+        <param name="locale">The context locale.</param>
+        <summary>Factory for creating an instance of BidiFormatter given the context locale.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#getInstance()" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -100,14 +99,13 @@
         <Parameter Name="rtlContext" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="rtlContext">Whether the context directionality is RTL.
-</param>
-        <summary>Factory for creating an instance of BidiFormatter for the default locale directionality.</summary>
+        <param name="rtlContext">Whether the context directionality is RTL.</param>
+        <summary>Factory for creating an instance of BidiFormatter given the context directionality.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#getInstance()" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#getInstance(boolean)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.getInstance(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -220,14 +218,14 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="str">CharSequence whose directionality is to be estimated.</param>
-        <summary>Operates like <c>#isRtl(String)</c>, but takes a CharSequence instead of a string</summary>
+        <param name="str">String whose directionality is to be estimated.</param>
+        <summary>Estimates the directionality of a string using the default text direction heuristic.</summary>
         <returns>true if <c>str</c>'s estimated overall directionality is RTL. Otherwise returns
                      false.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#isRtl(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.isRtl(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#isRtl(java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.isRtl(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -463,16 +461,16 @@
         <Parameter Name="heuristic" Type="Android.Text.ITextDirectionHeuristic" />
       </Parameters>
       <Docs>
-        <param name="heuristic">The algorithm to be used to estimate the string's overall direction.
-        See <see cref="T:Android.Text.TextDirectionHeuristics" /> for pre-defined heuristics.</param>
         <param name="str">The input CharSequence.</param>
-        <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but uses
-            the formatter's default direction estimation algorithm and assumes <c>isolate</c> is true.</summary>
+        <param name="heuristic">The algorithm to be used to estimate the CharSequence's overall direction.
+                   See <c>TextDirectionHeuristics</c> for pre-defined heuristics.</param>
+        <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but
+            assumes <c>isolate</c> is true.</summary>
         <returns>Input CharSequence after applying the above processing.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence,%20android.text.TextDirectionHeuristic)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence, android.text.TextDirectionHeuristic)</code>.</a>
             </format>
           </para>
           <para>
@@ -502,16 +500,16 @@
         <Parameter Name="isolate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="isolate">Whether to directionally isolate the string to prevent it from garbling the
-     content around it</param>
         <param name="str">The input CharSequence.</param>
+        <param name="isolate">Whether to directionally isolate the CharSequence to prevent it from garbling
+                the content around it</param>
         <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but uses
-            the formatter's default direction estimation algorithm and assumes <c>isolate</c> is true.</summary>
+            the formatter's default direction estimation algorithm.</summary>
         <returns>Input CharSequence after applying the above processing.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -542,18 +540,19 @@
         <Parameter Name="isolate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="heuristic">The algorithm to be used to estimate the string's overall direction.
-        See <see cref="T:Android.Text.TextDirectionHeuristics" /> for pre-defined heuristics.</param>
-        <param name="isolate">Whether to directionally isolate the string to prevent it from garbling the
-     content around it</param>
         <param name="str">The input CharSequence.</param>
-        <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but uses
-            the formatter's default direction estimation algorithm and assumes <c>isolate</c> is true.</summary>
-        <returns>Input CharSequence after applying the above processing.</returns>
+        <param name="heuristic">The algorithm to be used to estimate the CharSequence's overall direction.
+                   See <c>TextDirectionHeuristics</c> for pre-defined heuristics.</param>
+        <param name="isolate">Whether to directionally isolate the CharSequence to prevent it from garbling
+                the content around it</param>
+        <summary>Operates like <c>#unicodeWrap(String, TextDirectionHeuristic, boolean)</c>, but takes a
+            CharSequence instead of a string</summary>
+        <returns>Input CharSequence after applying the above processing. <c>null</c> if <c>str</c>
+                is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence,%20android.text.TextDirectionHeuristic,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence, android.text.TextDirectionHeuristic, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -630,15 +629,16 @@
         <Parameter Name="heuristic" Type="Android.Text.ITextDirectionHeuristic" />
       </Parameters>
       <Docs>
-        <param name="heuristic">To be added.</param>
         <param name="str">The input CharSequence.</param>
-        <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but uses
-            the formatter's default direction estimation algorithm and assumes <c>isolate</c> is true.</summary>
+        <param name="heuristic">The algorithm to be used to estimate the CharSequence's overall direction.
+                   See <c>TextDirectionHeuristics</c> for pre-defined heuristics.</param>
+        <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but
+            assumes <c>isolate</c> is true.</summary>
         <returns>Input CharSequence after applying the above processing.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence,%20android.text.TextDirectionHeuristic)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence, android.text.TextDirectionHeuristic)</code>.</a>
             </format>
           </para>
           <para>
@@ -673,15 +673,16 @@
         <Parameter Name="isolate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="isolate">To be added.</param>
         <param name="str">The input CharSequence.</param>
+        <param name="isolate">Whether to directionally isolate the CharSequence to prevent it from garbling
+                the content around it</param>
         <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but uses
-            the formatter's default direction estimation algorithm and assumes <c>isolate</c> is true.</summary>
+            the formatter's default direction estimation algorithm.</summary>
         <returns>Input CharSequence after applying the above processing.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -717,16 +718,19 @@
         <Parameter Name="isolate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="heuristic">To be added.</param>
-        <param name="isolate">To be added.</param>
         <param name="str">The input CharSequence.</param>
-        <summary>Operates like <c>#unicodeWrap(CharSequence, TextDirectionHeuristic, boolean)</c>, but uses
-            the formatter's default direction estimation algorithm and assumes <c>isolate</c> is true.</summary>
-        <returns>Input CharSequence after applying the above processing.</returns>
+        <param name="heuristic">The algorithm to be used to estimate the CharSequence's overall direction.
+                   See <c>TextDirectionHeuristics</c> for pre-defined heuristics.</param>
+        <param name="isolate">Whether to directionally isolate the CharSequence to prevent it from garbling
+                the content around it</param>
+        <summary>Operates like <c>#unicodeWrap(String, TextDirectionHeuristic, boolean)</c>, but takes a
+            CharSequence instead of a string</summary>
+        <returns>Input CharSequence after applying the above processing. <c>null</c> if <c>str</c>
+                is <c>null</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/BidiFormatter#unicodeWrap(java.lang.CharSequence,%20android.text.TextDirectionHeuristic,%20boolean)" title="Reference documentation">Java documentation for <code>android.text.BidiFormatter.unicodeWrap(java.lang.CharSequence, android.text.TextDirectionHeuristic, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/BoringLayout.xml b/docs/Mono.Android/en/Android.Text/BoringLayout.xml
index 13c13972f7..b1c2394f9d 100644
--- a/docs/Mono.Android/en/Android.Text/BoringLayout.xml
+++ b/docs/Mono.Android/en/Android.Text/BoringLayout.xml
@@ -198,12 +198,9 @@
         <Parameter Name="ellipsizedWidth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="outerWidth">To be added.</param>
-        <param name="ellipsize">To be added.</param>
-        <param name="ellipsizedWidth">To be added.</param>
         <param name="source">the text to render</param>
         <param name="paint">the default paint for the layout</param>
-        <param name="outerwidth">the wrapping width for the text</param>
+        <param name="outerWidth">To be added.</param>
         <param name="align">whether to left, right, or center the text</param>
         <param name="spacingMult">this value is no longer used by BoringLayout</param>
         <param name="spacingAdd">this value is no longer used by BoringLayout</param>
@@ -212,6 +209,8 @@
                            line width</param>
         <param name="includePad">set whether to include extra space beyond font ascent and descent which is
                               needed to avoid clipping in some scripts</param>
+        <param name="ellipsize">To be added.</param>
+        <param name="ellipsizedWidth">To be added.</param>
         <summary>
         </summary>
         <remarks>
@@ -724,9 +723,9 @@
         <Parameter Name="metrics" Type="Android.Text.BoringLayout+Metrics" />
       </Parameters>
       <Docs>
-        <param name="metrics">To be added.</param>
         <param name="text">a text</param>
         <param name="paint">a paint</param>
+        <param name="metrics">To be added.</param>
         <summary>Determine and compute metrics if given text can be handled by BoringLayout.</summary>
         <returns>layout metric for the given text. null if given text is unable to be handled by
                     BoringLayout.</returns>
@@ -764,9 +763,9 @@
         <Parameter Name="metrics" Type="Android.Text.BoringLayout+Metrics" />
       </Parameters>
       <Docs>
-        <param name="metrics">To be added.</param>
         <param name="text">a text</param>
         <param name="paint">a paint</param>
+        <param name="metrics">To be added.</param>
         <summary>Determine and compute metrics if given text can be handled by BoringLayout.</summary>
         <returns>layout metric for the given text. null if given text is unable to be handled by
                     BoringLayout.</returns>
@@ -987,21 +986,19 @@
         <Parameter Name="ellipsizedWidth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="spacingmult">To be added.</param>
-        <param name="spacingadd">To be added.</param>
-        <param name="ellipsize">To be added.</param>
-        <param name="ellipsizedWidth">To be added.</param>
         <param name="source">the text to render</param>
         <param name="paint">the default paint for the layout</param>
         <param name="outerWidth">the wrapping width for the text</param>
         <param name="align">whether to left, right, or center the text</param>
-        <param name="spacingMult">this value is no longer used by BoringLayout</param>
-        <param name="spacingAdd">this value is no longer used by BoringLayout</param>
+        <param name="spacingmult">To be added.</param>
+        <param name="spacingadd">To be added.</param>
         <param name="metrics">
           <c>#Metrics</c> instance that contains information about FontMetrics and
                            line width</param>
         <param name="includePad">set whether to include extra space beyond font ascent and descent which is
                               needed to avoid clipping in some scripts</param>
+        <param name="ellipsize">To be added.</param>
+        <param name="ellipsizedWidth">To be added.</param>
         <summary>Utility function to construct a BoringLayout instance.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -1045,21 +1042,19 @@
         <Parameter Name="ellipsizedWidth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="spacingmult">To be added.</param>
-        <param name="spacingadd">To be added.</param>
-        <param name="ellipsize">To be added.</param>
-        <param name="ellipsizedWidth">To be added.</param>
         <param name="source">the text to render</param>
         <param name="paint">the default paint for the layout</param>
         <param name="outerWidth">the wrapping width for the text</param>
         <param name="align">whether to left, right, or center the text</param>
-        <param name="spacingMult">this value is no longer used by BoringLayout</param>
-        <param name="spacingAdd">this value is no longer used by BoringLayout</param>
+        <param name="spacingmult">To be added.</param>
+        <param name="spacingadd">To be added.</param>
         <param name="metrics">
           <c>#Metrics</c> instance that contains information about FontMetrics and
                            line width</param>
         <param name="includePad">set whether to include extra space beyond font ascent and descent which is
                               needed to avoid clipping in some scripts</param>
+        <param name="ellipsize">To be added.</param>
+        <param name="ellipsizedWidth">To be added.</param>
         <summary>Utility function to construct a BoringLayout instance.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -1219,12 +1214,9 @@
         <Parameter Name="ellipsizedWidth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="outerWidth">To be added.</param>
-        <param name="ellipsize">To be added.</param>
-        <param name="ellipsizedWidth">To be added.</param>
         <param name="source">the text to render</param>
         <param name="paint">the default paint for the layout</param>
-        <param name="outerwidth">the wrapping width for the text</param>
+        <param name="outerWidth">To be added.</param>
         <param name="align">whether to left, right, or center the text</param>
         <param name="spacingMult">this value is no longer used by BoringLayout</param>
         <param name="spacingAdd">this value is no longer used by BoringLayout</param>
@@ -1233,6 +1225,8 @@
                            line width</param>
         <param name="includePad">set whether to include extra space beyond font ascent and descent which is
                               needed to avoid clipping in some scripts</param>
+        <param name="ellipsize">To be added.</param>
+        <param name="ellipsizedWidth">To be added.</param>
         <summary>Returns a BoringLayout for the specified text, potentially reusing
             this one if it is already suitable.</summary>
         <returns>To be added.</returns>
@@ -1277,12 +1271,9 @@
         <Parameter Name="ellipsizedWidth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="outerWidth">To be added.</param>
-        <param name="ellipsize">To be added.</param>
-        <param name="ellipsizedWidth">To be added.</param>
         <param name="source">the text to render</param>
         <param name="paint">the default paint for the layout</param>
-        <param name="outerwidth">the wrapping width for the text</param>
+        <param name="outerWidth">To be added.</param>
         <param name="align">whether to left, right, or center the text</param>
         <param name="spacingMult">this value is no longer used by BoringLayout</param>
         <param name="spacingAdd">this value is no longer used by BoringLayout</param>
@@ -1291,6 +1282,8 @@
                            line width</param>
         <param name="includePad">set whether to include extra space beyond font ascent and descent which is
                               needed to avoid clipping in some scripts</param>
+        <param name="ellipsize">To be added.</param>
+        <param name="ellipsizedWidth">To be added.</param>
         <summary>Returns a BoringLayout for the specified text, potentially reusing
             this one if it is already suitable.</summary>
         <returns>To be added.</returns>
diff --git a/docs/Mono.Android/en/Android.Text/Html.xml b/docs/Mono.Android/en/Android.Text/Html.xml
index 2566833b09..24485810b7 100644
--- a/docs/Mono.Android/en/Android.Text/Html.xml
+++ b/docs/Mono.Android/en/Android.Text/Html.xml
@@ -211,13 +211,12 @@
       <Docs>
         <param name="source">To be added.</param>
         <param name="flags">To be added.</param>
-        <summary>Returns displayable styled text from the provided HTML string with the legacy flags
-            <c>#FROM_HTML_MODE_LEGACY</c>.</summary>
+        <summary>Returns displayable styled text from the provided HTML string.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Html#fromHtml(java.lang.String)" title="Reference documentation">Java documentation for <code>android.text.Html.fromHtml(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Html#fromHtml(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.text.Html.fromHtml(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -870,14 +869,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="option">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="text">input text to convert</param>
+        <param name="option">one of <c>#TO_HTML_PARAGRAPH_LINES_CONSECUTIVE</c> or
+                <c>#TO_HTML_PARAGRAPH_LINES_INDIVIDUAL</c></param>
+        <summary>Returns an HTML representation of the provided Spanned text.</summary>
+        <returns>string containing input converted to HTML</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Html#toHtml(android.text.Spanned)" title="Reference documentation">Java documentation for <code>android.text.Html.toHtml(android.text.Spanned)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Html#toHtml(android.text.Spanned,%20int)" title="Reference documentation">Java documentation for <code>android.text.Html.toHtml(android.text.Spanned, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/IEditable.xml b/docs/Mono.Android/en/Android.Text/IEditable.xml
index d1b6750052..c47bf9e35c 100644
--- a/docs/Mono.Android/en/Android.Text/IEditable.xml
+++ b/docs/Mono.Android/en/Android.Text/IEditable.xml
@@ -91,12 +91,12 @@
       </Parameters>
       <Docs>
         <param name="text">the character sequence to append.</param>
-        <summary>Convenience for append(String.</summary>
+        <summary>Convenience for replace(length(), length(), text, 0, text.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Editable#append(char)" title="Reference documentation">Java documentation for <code>android.text.Editable.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Editable#append(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.Editable.append(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,12 +187,12 @@
             appended.</param>
         <param name="end">the last index of the subsequence of <c>csq</c> that is
             appended.</param>
-        <summary>Convenience for append(String.</summary>
+        <summary>Convenience for replace(length(), length(), text, start, end)</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Editable#append(char)" title="Reference documentation">Java documentation for <code>android.text.Editable.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Editable#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.Editable.append(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -438,12 +438,12 @@
         <param name="text">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <summary>Convenience for replace(where, where, text, 0, text.</summary>
+        <summary>Convenience for replace(where, where, text, start, end)</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Editable#insert(int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.Editable.insert(int, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Editable#insert(int,%20java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.Editable.insert(int, java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -534,12 +534,14 @@
         <param name="source">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <summary>Convenience for replace(st, en, text, 0, text.</summary>
-        <returns>To be added.</returns>
+        <summary>Replaces the specified range (&lt;code&gt;st&amp;hellip;en&lt;/code&gt;) of text in this
+            Editable with a copy of the slice &lt;code&gt;start&amp;hellip;end&lt;/code&gt; from
+            &lt;code&gt;source&lt;/code&gt;.</summary>
+        <returns>a reference to this object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Editable#replace(int,%20int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.Editable.replace(int, int, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Editable#replace(int,%20int,%20java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.Editable.replace(int, int, java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/ITextDirectionHeuristic.xml b/docs/Mono.Android/en/Android.Text/ITextDirectionHeuristic.xml
index aaf45fb2f2..d082c550c0 100644
--- a/docs/Mono.Android/en/Android.Text/ITextDirectionHeuristic.xml
+++ b/docs/Mono.Android/en/Android.Text/ITextDirectionHeuristic.xml
@@ -114,17 +114,16 @@
       </Parameters>
       <Docs>
         <param name="array">the char array.</param>
-        <param name="cs">the CharSequence.</param>
         <param name="start">start index, inclusive.</param>
         <param name="count">the length to check, must not be negative and not greater than
-                       <c>CharSequence.length() - start</c>.</param>
-        <summary>Guess if a <c>CharSequence</c> is in the RTL direction or not.</summary>
+                     <c>array.length - start</c>.</param>
+        <summary>Guess if a chars array is in the RTL direction or not.</summary>
         <returns>true if all chars in the range are to be considered in a RTL direction,
                      false otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/TextDirectionHeuristic#isRtl(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.TextDirectionHeuristic.isRtl(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/TextDirectionHeuristic#isRtl(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.TextDirectionHeuristic.isRtl(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/Layout.xml b/docs/Mono.Android/en/Android.Text/Layout.xml
index c39dae3890..12d3078769 100644
--- a/docs/Mono.Android/en/Android.Text/Layout.xml
+++ b/docs/Mono.Android/en/Android.Text/Layout.xml
@@ -297,13 +297,13 @@
         <param name="highlight">the path of the highlight or cursor; can be null</param>
         <param name="highlightPaint">the paint for the highlight</param>
         <param name="cursorOffsetVertical">the amount to temporarily translate the
-        canvas while rendering the highlight
-</param>
-        <summary>Draw this Layout on the specified Canvas.</summary>
+                   canvas while rendering the highlight</param>
+        <summary>Draw this Layout on the specified canvas, with the highlight path drawn
+            between the background and the text.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Layout#draw(android.graphics.Canvas)" title="Reference documentation">Java documentation for <code>android.text.Layout.draw(android.graphics.Canvas)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Layout#draw(android.graphics.Canvas,%20android.graphics.Path,%20android.graphics.Paint,%20int)" title="Reference documentation">Java documentation for <code>android.text.Layout.draw(android.graphics.Canvas, android.graphics.Path, android.graphics.Paint, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -500,13 +500,13 @@
       <Docs>
         <param name="source">To be added.</param>
         <param name="paint">To be added.</param>
-        <summary>Return how wide a layout must be in order to display the specified text slice with one
-            line per paragraph.</summary>
+        <summary>Return how wide a layout must be in order to display the specified text with one line per
+            paragraph.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Layout#getDesiredWidth(java.lang.CharSequence,%20int,%20int,%20android.text.TextPaint)" title="Reference documentation">Java documentation for <code>android.text.Layout.getDesiredWidth(java.lang.CharSequence, int, int, android.text.TextPaint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Layout#getDesiredWidth(java.lang.CharSequence,%20android.text.TextPaint)" title="Reference documentation">Java documentation for <code>android.text.Layout.getDesiredWidth(java.lang.CharSequence, android.text.TextPaint)</code>.</a>
             </format>
           </para>
           <para>
@@ -538,13 +538,13 @@
       <Docs>
         <param name="source">To be added.</param>
         <param name="paint">To be added.</param>
-        <summary>Return how wide a layout must be in order to display the specified text slice with one
-            line per paragraph.</summary>
+        <summary>Return how wide a layout must be in order to display the specified text with one line per
+            paragraph.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Layout#getDesiredWidth(java.lang.CharSequence,%20int,%20int,%20android.text.TextPaint)" title="Reference documentation">Java documentation for <code>android.text.Layout.getDesiredWidth(java.lang.CharSequence, int, int, android.text.TextPaint)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Layout#getDesiredWidth(java.lang.CharSequence,%20android.text.TextPaint)" title="Reference documentation">Java documentation for <code>android.text.Layout.getDesiredWidth(java.lang.CharSequence, android.text.TextPaint)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/Selection.xml b/docs/Mono.Android/en/Android.Text/Selection.xml
index 66c0a0ea3e..28d9215cd2 100644
--- a/docs/Mono.Android/en/Android.Text/Selection.xml
+++ b/docs/Mono.Android/en/Android.Text/Selection.xml
@@ -990,11 +990,12 @@
         <param name="text">To be added.</param>
         <param name="start">To be added.</param>
         <param name="stop">To be added.</param>
-        <summary>Move the cursor to offset &lt;code&gt;index&lt;/code&gt;.</summary>
+        <summary>Set the selection anchor to &lt;code&gt;start&lt;/code&gt; and the selection edge
+            to &lt;code&gt;stop&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/Selection#setSelection(android.text.Spannable,%20int)" title="Reference documentation">Java documentation for <code>android.text.Selection.setSelection(android.text.Spannable, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/Selection#setSelection(android.text.Spannable,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.Selection.setSelection(android.text.Spannable, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml b/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml
index e0dabac189..03bfe78c84 100644
--- a/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml
+++ b/docs/Mono.Android/en/Android.Text/SpannableStringBuilder.xml
@@ -122,11 +122,12 @@
       </Parameters>
       <Docs>
         <param name="text">To be added.</param>
-        <summary>Create a new SpannableStringBuilder with empty contents</summary>
+        <summary>Create a new SpannableStringBuilder containing a copy of the
+            specified text, including its spans if any.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/SpannableStringBuilder#SpannableStringBuilder()" title="Reference documentation">Java documentation for <code>android.text.SpannableStringBuilder.SpannableStringBuilder()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/SpannableStringBuilder#SpannableStringBuilder(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.SpannableStringBuilder.SpannableStringBuilder(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -215,11 +216,12 @@
         <param name="text">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <summary>Create a new SpannableStringBuilder with empty contents</summary>
+        <summary>Create a new SpannableStringBuilder containing a copy of the
+            specified slice of the specified text, including its spans if any.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/SpannableStringBuilder#SpannableStringBuilder()" title="Reference documentation">Java documentation for <code>android.text.SpannableStringBuilder.SpannableStringBuilder()</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/SpannableStringBuilder#SpannableStringBuilder(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.text.SpannableStringBuilder.SpannableStringBuilder(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -291,8 +293,6 @@
       </Parameters>
       <Docs>
         <param name="text">the character sequence to append.</param>
-        <param name="what">the object to be spanned over the appended text.</param>
-        <param name="flags">see <c>Spanned</c>.</param>
         <summary>Appends the character sequence <c>text</c> and spans <c>what</c> over the appended part.</summary>
         <returns>this <c>SpannableStringBuilder</c>.</returns>
         <remarks>
@@ -337,8 +337,6 @@
       </Parameters>
       <Docs>
         <param name="text">the character sequence to append.</param>
-        <param name="what">the object to be spanned over the appended text.</param>
-        <param name="flags">see <c>Spanned</c>.</param>
         <summary>Appends the character sequence <c>text</c> and spans <c>what</c> over the appended part.</summary>
         <returns>this <c>SpannableStringBuilder</c>.</returns>
         <remarks>
@@ -374,8 +372,6 @@
       </Parameters>
       <Docs>
         <param name="text">the character sequence to append.</param>
-        <param name="what">the object to be spanned over the appended text.</param>
-        <param name="flags">see <c>Spanned</c>.</param>
         <summary>Appends the character sequence <c>text</c> and spans <c>what</c> over the appended part.</summary>
         <returns>this <c>SpannableStringBuilder</c>.</returns>
         <remarks>
@@ -471,13 +467,11 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="text">the character sequence to append.</param>
         <param name="start">the first index of the subsequence of <c>csq</c> that is
             appended.</param>
         <param name="end">the last index of the subsequence of <c>csq</c> that is
             appended.</param>
-        <param name="text">the character sequence to append.</param>
-        <param name="what">the object to be spanned over the appended text.</param>
-        <param name="flags">see <c>Spanned</c>.</param>
         <summary>Appends the character sequence <c>text</c> and spans <c>what</c> over the appended part.</summary>
         <returns>this <c>SpannableStringBuilder</c>.</returns>
         <remarks>
@@ -559,11 +553,9 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="text">the character sequence to append.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <param name="text">the character sequence to append.</param>
-        <param name="what">the object to be spanned over the appended text.</param>
-        <param name="flags">see <c>Spanned</c>.</param>
         <summary>Appends the character sequence <c>text</c> and spans <c>what</c> over the appended part.</summary>
         <returns>this <c>SpannableStringBuilder</c>.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Text/TextUtils.xml b/docs/Mono.Android/en/Android.Text/TextUtils.xml
index e7573b7bc5..e7cfc4a759 100644
--- a/docs/Mono.Android/en/Android.Text/TextUtils.xml
+++ b/docs/Mono.Android/en/Android.Text/TextUtils.xml
@@ -1928,12 +1928,12 @@
       </Parameters>
       <Docs>
         <param name="str">To be added.</param>
-        <summary>Returns whether this character is a printable character.</summary>
+        <summary>Returns whether the given CharSequence contains any printable characters.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/TextUtils#isGraphic(char)" title="Reference documentation">Java documentation for <code>android.text.TextUtils.isGraphic(char)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/TextUtils#isGraphic(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.TextUtils.isGraphic(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -2008,12 +2008,12 @@
       </Parameters>
       <Docs>
         <param name="str">To be added.</param>
-        <summary>Returns whether this character is a printable character.</summary>
+        <summary>Returns whether the given CharSequence contains any printable characters.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/TextUtils#isGraphic(char)" title="Reference documentation">Java documentation for <code>android.text.TextUtils.isGraphic(char)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/TextUtils#isGraphic(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.text.TextUtils.isGraphic(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -2129,13 +2129,13 @@
                 "null" will be used as the delimiter.</param>
         <param name="tokens">an array objects to be joined. Strings will be formed from the objects by
                 calling object.toString(). If tokens is null, a NullPointerException will be thrown. If
-                tokens is empty, an empty string will be returned.</param>
+                tokens is an empty array, an empty string will be returned.</param>
         <summary>Returns a string containing the tokens joined by delimiters.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/TextUtils#join(java.lang.CharSequence,%20java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.text.TextUtils.join(java.lang.CharSequence, java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/TextUtils#join(java.lang.CharSequence,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.text.TextUtils.join(java.lang.CharSequence, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2208,13 +2208,13 @@
                 "null" will be used as the delimiter.</param>
         <param name="tokens">an array objects to be joined. Strings will be formed from the objects by
                 calling object.toString(). If tokens is null, a NullPointerException will be thrown. If
-                tokens is empty, an empty string will be returned.</param>
+                tokens is an empty array, an empty string will be returned.</param>
         <summary>Returns a string containing the tokens joined by delimiters.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/text/TextUtils#join(java.lang.CharSequence,%20java.lang.Iterable)" title="Reference documentation">Java documentation for <code>android.text.TextUtils.join(java.lang.CharSequence, java.lang.Iterable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/text/TextUtils#join(java.lang.CharSequence,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.text.TextUtils.join(java.lang.CharSequence, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2847,10 +2847,19 @@
       <Docs>
         <param name="text">the string to split</param>
         <param name="pattern">the regular expression to match</param>
-        <summary tool="true">Splits a string on a pattern.</summary>
-        <returns>To be added.</returns>
+        <summary>Splits a string on a pattern.</summary>
+        <returns>an array of strings. The array will be empty if text is empty</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/text/TextUtils#split(java.lang.String,%20java.util.regex.Pattern)" title="Reference documentation">Java documentation for <code>android.text.TextUtils.split(java.lang.String, java.util.regex.Pattern)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <exception cref="T:Java.Lang.NullPointerException">if expression or text is null
diff --git a/docs/Mono.Android/en/Android.Transitions/Fade.xml b/docs/Mono.Android/en/Android.Transitions/Fade.xml
index 6551af4664..60bd5d4395 100644
--- a/docs/Mono.Android/en/Android.Transitions/Fade.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Fade.xml
@@ -94,12 +94,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="fadingMode">To be added.</param>
-        <summary>Constructs a Fade transition that will fade targets in and out.</summary>
+        <param name="fadingMode">The behavior of this transition, a combination of
+            <c>#IN</c> and <c>#OUT</c>.</param>
+        <summary>Constructs a Fade transition that will fade targets in
+            and/or out, according to the value of fadingMode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Fade#Fade()" title="Reference documentation">Java documentation for <code>android.transition.Fade.Fade()</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Fade#Fade(int)" title="Reference documentation">Java documentation for <code>android.transition.Fade.Fade(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/PatternPathMotion.xml b/docs/Mono.Android/en/Android.Transitions/PatternPathMotion.xml
index f6a114e3cf..65bd5bcd65 100644
--- a/docs/Mono.Android/en/Android.Transitions/PatternPathMotion.xml
+++ b/docs/Mono.Android/en/Android.Transitions/PatternPathMotion.xml
@@ -85,12 +85,13 @@
         <Parameter Name="patternPath" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="patternPath">To be added.</param>
-        <summary>Constructs a PatternPathMotion with a straight-line pattern.</summary>
+        <param name="patternPath">A Path to be used as a pattern for two-dimensional motion.</param>
+        <summary>Creates a PatternPathMotion with the Path defining a pattern of motion between two
+            coordinates.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/PatternPathMotion#PatternPathMotion()" title="Reference documentation">Java documentation for <code>android.transition.PatternPathMotion.PatternPathMotion()</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/PatternPathMotion#PatternPathMotion(android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.transition.PatternPathMotion.PatternPathMotion(android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/Scene.xml b/docs/Mono.Android/en/Android.Transitions/Scene.xml
index d08f4f2c91..a33917517b 100644
--- a/docs/Mono.Android/en/Android.Transitions/Scene.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Scene.xml
@@ -93,15 +93,17 @@
         <Parameter Name="layout" Type="Android.Views.View" />
       </Parameters>
       <Docs>
-        <param name="layout">To be added.</param>
         <param name="sceneRoot">The root of the hierarchy in which scene changes
             and transitions will take place.</param>
-        <summary>Constructs a Scene with no information about how values will change
-            when this scene is applied.</summary>
+        <param name="layout">The view hierarchy of this scene, added as a child
+            of sceneRoot when this scene is entered.</param>
+        <summary>Constructs a Scene which, when entered, will remove any
+            children from the sceneRoot container and add the layout
+            object as a new child of that container.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Scene#Scene(android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.transition.Scene.Scene(android.view.ViewGroup)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Scene#Scene(android.view.ViewGroup,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.transition.Scene.Scene(android.view.ViewGroup, android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -137,15 +139,15 @@
         <Parameter Name="layout" Type="Android.Views.ViewGroup" />
       </Parameters>
       <Docs>
-        <param name="layout">To be added.</param>
         <param name="sceneRoot">The root of the hierarchy in which scene changes
             and transitions will take place.</param>
+        <param name="layout">To be added.</param>
         <summary>Constructs a Scene with no information about how values will change
             when this scene is applied.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Scene#Scene(android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.transition.Scene.Scene(android.view.ViewGroup)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Scene#Scene(android.view.ViewGroup,%20android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.transition.Scene.Scene(android.view.ViewGroup, android.view.ViewGroup)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/Slide.xml b/docs/Mono.Android/en/Android.Transitions/Slide.xml
index a7d0b504c8..9461e65654 100644
--- a/docs/Mono.Android/en/Android.Transitions/Slide.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Slide.xml
@@ -96,12 +96,11 @@
       </Parameters>
       <Docs>
         <param name="slideEdge">To be added.</param>
-        <summary>Constructor using the default <c>Gravity#BOTTOM</c>
-            slide edge direction.</summary>
+        <summary>Constructor using the provided slide edge direction.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Slide#Slide()" title="Reference documentation">Java documentation for <code>android.transition.Slide.Slide()</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Slide#Slide(int)" title="Reference documentation">Java documentation for <code>android.transition.Slide.Slide(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/Transition.xml b/docs/Mono.Android/en/Android.Transitions/Transition.xml
index f418f37479..d95153bd38 100644
--- a/docs/Mono.Android/en/Android.Transitions/Transition.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Transition.xml
@@ -96,13 +96,15 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <summary>Constructs a Transition object with no target objects.</summary>
+        <param name="context">The Context the transition is running in, through which it can
+                   access the current theme, resources, etc.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the transition.</param>
+        <summary>Perform inflation from XML and apply a class-specific base style from a
+            theme attribute or style resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#Transition()" title="Reference documentation">Java documentation for <code>android.transition.Transition.Transition()</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#Transition(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.transition.Transition.Transition(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,17 +204,16 @@
       </Parameters>
       <Docs>
         <param name="target">A View on which the Transition will act, must be non-null.</param>
-        <param name="targetId">The id of a target view, must be a positive number.</param>
-        <summary>Adds the id of a target view that this Transition is interested in
+        <summary>Sets the target view instances that this Transition is interested in
             animating.</summary>
-        <returns>The Transition to which the targetId is added.
+        <returns>The Transition to which the target is added.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someId);&lt;/code&gt;</returns>
+            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someView);&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#addTarget(int)" title="Reference documentation">Java documentation for <code>android.transition.Transition.addTarget(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#addTarget(android.view.View)" title="Reference documentation">Java documentation for <code>android.transition.Transition.addTarget(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -248,17 +249,16 @@
       </Parameters>
       <Docs>
         <param name="targetType">The type to include when running this transition.</param>
-        <param name="targetId">The id of a target view, must be a positive number.</param>
-        <summary>Adds the id of a target view that this Transition is interested in
+        <summary>Adds the Class of a target view that this Transition is interested in
             animating.</summary>
-        <returns>The Transition to which the targetId is added.
+        <returns>The Transition to which the target class was added.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someId);&lt;/code&gt;</returns>
+            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(ImageView.class);&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#addTarget(int)" title="Reference documentation">Java documentation for <code>android.transition.Transition.addTarget(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#addTarget(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.transition.Transition.addTarget(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -342,17 +342,16 @@
       </Parameters>
       <Docs>
         <param name="targetName">The transitionName of a target view, must be non-null.</param>
-        <param name="targetId">The id of a target view, must be a positive number.</param>
-        <summary>Adds the id of a target view that this Transition is interested in
+        <summary>Adds the transitionName of a target view that this Transition is interested in
             animating.</summary>
-        <returns>The Transition to which the targetId is added.
+        <returns>The Transition to which the target transitionName is added.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someId);&lt;/code&gt;</returns>
+            &lt;code&gt;transitionSet.addTransitions(new Fade()).addTarget(someName);&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#addTarget(int)" title="Reference documentation">Java documentation for <code>android.transition.Transition.addTarget(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#addTarget(java.lang.String)" title="Reference documentation">Java documentation for <code>android.transition.Transition.addTarget(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -668,17 +667,15 @@
       </Parameters>
       <Docs>
         <param name="target">The target to ignore when running this transition.</param>
-        <param name="targetId">The id of a target whose children should be ignored when running
-            this transition.</param>
         <param name="exclude">Whether to add the target to or remove the target from the
-            current list of excluded-child targets.</param>
-        <summary>Whether to add the children of the given id to the list of targets to exclude
-            from this transition.</summary>
+            current list of excluded targets.</param>
+        <summary>Whether to add the children of given target to the list of target children
+            to exclude from this transition.</summary>
         <returns>This transition object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#excludeChildren(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeChildren(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#excludeChildren(android.view.View,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeChildren(android.view.View, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -717,17 +714,15 @@
       </Parameters>
       <Docs>
         <param name="type">The type to ignore when running this transition.</param>
-        <param name="targetId">The id of a target whose children should be ignored when running
-            this transition.</param>
-        <param name="exclude">Whether to add the target to or remove the target from the
-            current list of excluded-child targets.</param>
-        <summary>Whether to add the children of the given id to the list of targets to exclude
-            from this transition.</summary>
+        <param name="exclude">Whether to add the target type to or remove it from the
+            current list of excluded target types.</param>
+        <summary>Whether to add the given type to the list of types whose children should
+            be excluded from this transition.</summary>
         <returns>This transition object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#excludeChildren(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeChildren(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#excludeChildren(java.lang.Class,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeChildren(java.lang.Class, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -814,16 +809,15 @@
       </Parameters>
       <Docs>
         <param name="target">The target to ignore when running this transition.</param>
-        <param name="targetId">The id of a target to ignore when running this transition.</param>
         <param name="exclude">Whether to add the target to or remove the target from the
             current list of excluded targets.</param>
-        <summary>Whether to add the given id to the list of target ids to exclude from this
+        <summary>Whether to add the given target to the list of targets to exclude from this
             transition.</summary>
         <returns>This transition object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#excludeTarget(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeTarget(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#excludeTarget(android.view.View,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeTarget(android.view.View, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -862,16 +856,15 @@
       </Parameters>
       <Docs>
         <param name="type">The type to ignore when running this transition.</param>
-        <param name="targetId">The id of a target to ignore when running this transition.</param>
-        <param name="exclude">Whether to add the target to or remove the target from the
-            current list of excluded targets.</param>
-        <summary>Whether to add the given id to the list of target ids to exclude from this
+        <param name="exclude">Whether to add the target type to or remove it from the
+            current list of excluded target types.</param>
+        <summary>Whether to add the given type to the list of types to exclude from this
             transition.</summary>
         <returns>This transition object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#excludeTarget(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeTarget(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#excludeTarget(java.lang.Class,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeTarget(java.lang.Class, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -957,16 +950,15 @@
       </Parameters>
       <Docs>
         <param name="targetName">The name of a target to ignore when running this transition.</param>
-        <param name="targetId">The id of a target to ignore when running this transition.</param>
         <param name="exclude">Whether to add the target to or remove the target from the
             current list of excluded targets.</param>
-        <summary>Whether to add the given id to the list of target ids to exclude from this
-            transition.</summary>
+        <summary>Whether to add the given transitionName to the list of target transitionNames to exclude
+            from this transition.</summary>
         <returns>This transition object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#excludeTarget(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeTarget(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#excludeTarget(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.transition.Transition.excludeTarget(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1588,17 +1580,16 @@
       </Parameters>
       <Docs>
         <param name="target">The target view, must be non-null.</param>
-        <param name="targetId">The id of a target view, must be a positive number.</param>
-        <summary>Removes the given targetId from the list of ids that this Transition
+        <summary>Removes the given target from the list of targets that this Transition
             is interested in animating.</summary>
-        <returns>The Transition from which the targetId is removed.
+        <returns>Transition The Transition from which the target is removed.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTargetId(someId);&lt;/code&gt;</returns>
+            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTarget(someView);&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#removeTarget(int)" title="Reference documentation">Java documentation for <code>android.transition.Transition.removeTarget(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#removeTarget(android.view.View)" title="Reference documentation">Java documentation for <code>android.transition.Transition.removeTarget(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -1633,17 +1624,16 @@
       </Parameters>
       <Docs>
         <param name="target">The type of the target view, must be non-null.</param>
-        <param name="targetId">The id of a target view, must be a positive number.</param>
-        <summary>Removes the given targetId from the list of ids that this Transition
+        <summary>Removes the given target from the list of targets that this Transition
             is interested in animating.</summary>
-        <returns>The Transition from which the targetId is removed.
+        <returns>Transition The Transition from which the target is removed.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTargetId(someId);&lt;/code&gt;</returns>
+            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTarget(someType);&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#removeTarget(int)" title="Reference documentation">Java documentation for <code>android.transition.Transition.removeTarget(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#removeTarget(java.lang.Class)" title="Reference documentation">Java documentation for <code>android.transition.Transition.removeTarget(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -1722,17 +1712,16 @@
       </Parameters>
       <Docs>
         <param name="targetName">The transitionName of a target view, must not be null.</param>
-        <param name="targetId">The id of a target view, must be a positive number.</param>
-        <summary>Removes the given targetId from the list of ids that this Transition
+        <summary>Removes the given targetName from the list of transitionNames that this Transition
             is interested in animating.</summary>
-        <returns>The Transition from which the targetId is removed.
+        <returns>The Transition from which the targetName is removed.
             Returning the same object makes it easier to chain calls during
             construction, such as
-            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTargetId(someId);&lt;/code&gt;</returns>
+            &lt;code&gt;transitionSet.addTransitions(new Fade()).removeTargetName(someName);&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#removeTarget(int)" title="Reference documentation">Java documentation for <code>android.transition.Transition.removeTarget(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#removeTarget(java.lang.String)" title="Reference documentation">Java documentation for <code>android.transition.Transition.removeTarget(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1899,7 +1888,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Transition#setMatchOrder(int)" title="Reference documentation">Java documentation for <code>android.transition.Transition.setMatchOrder(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Transition#setMatchOrder(int[])" title="Reference documentation">Java documentation for <code>android.transition.Transition.setMatchOrder(int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/TransitionManager.xml b/docs/Mono.Android/en/Android.Transitions/TransitionManager.xml
index 9aae9bd18c..1600e025f4 100644
--- a/docs/Mono.Android/en/Android.Transitions/TransitionManager.xml
+++ b/docs/Mono.Android/en/Android.Transitions/TransitionManager.xml
@@ -142,17 +142,15 @@
         <Parameter Name="transition" Type="Android.Transitions.Transition" />
       </Parameters>
       <Docs>
-        <param name="transition">The transition to use for this change. A
- value of null causes the TransitionManager to use the default transition.
-</param>
         <param name="sceneRoot">The root of the View hierarchy to run the transition on.</param>
-        <summary>Convenience method to animate, using the default transition,
-            to a new scene defined by all changes within the given scene root between
-            calling this method and the next rendering frame.</summary>
+        <param name="transition">The transition to use for this change. A
+            value of null causes the TransitionManager to use the default transition.</param>
+        <summary>Convenience method to animate to a new scene defined by all changes within
+            the given scene root between calling this method and the next rendering frame.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/TransitionManager#beginDelayedTransition(android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.transition.TransitionManager.beginDelayedTransition(android.view.ViewGroup)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/TransitionManager#beginDelayedTransition(android.view.ViewGroup,%20android.transition.Transition)" title="Reference documentation">Java documentation for <code>android.transition.TransitionManager.beginDelayedTransition(android.view.ViewGroup, android.transition.Transition)</code>.</a>
             </format>
           </para>
           <para>
@@ -266,16 +264,15 @@
         <Parameter Name="transition" Type="Android.Transitions.Transition" />
       </Parameters>
       <Docs>
-        <param name="transition">The transition to use for this scene change. A
- value of null causes the scene change to happen with no transition.
-</param>
         <param name="scene">The Scene to change to</param>
+        <param name="transition">The transition to use for this scene change. A
+            value of null causes the scene change to happen with no transition.</param>
         <summary>Convenience method to simply change to the given scene using
-            the default transition for TransitionManager.</summary>
+            the given transition.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/TransitionManager#go(android.transition.Scene)" title="Reference documentation">Java documentation for <code>android.transition.TransitionManager.go(android.transition.Scene)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/TransitionManager#go(android.transition.Scene,%20android.transition.Transition)" title="Reference documentation">Java documentation for <code>android.transition.TransitionManager.go(android.transition.Scene, android.transition.Transition)</code>.</a>
             </format>
           </para>
           <para>
@@ -342,20 +339,15 @@
       </Parameters>
       <Docs>
         <param name="scene">The scene which, when applied, will cause the given
- transition to run.</param>
-        <param name="fromScene">The scene being exited when the given transition will
-            be run</param>
-        <param name="toScene">The scene being entered when the given transition will
-            be run</param>
+            transition to run.</param>
         <param name="transition">The transition that will play when the given scene is
             entered. A value of null will result in the default behavior of
             using the default transition instead.</param>
-        <summary>Sets a specific transition to occur when the given pair of scenes is
-            exited/entered.</summary>
+        <summary>Sets a specific transition to occur when the given scene is entered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/TransitionManager#setTransition(android.transition.Scene,%20android.transition.Scene,%20android.transition.Transition)" title="Reference documentation">Java documentation for <code>android.transition.TransitionManager.setTransition(android.transition.Scene, android.transition.Scene, android.transition.Transition)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/TransitionManager#setTransition(android.transition.Scene,%20android.transition.Transition)" title="Reference documentation">Java documentation for <code>android.transition.TransitionManager.setTransition(android.transition.Scene, android.transition.Transition)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Transitions/Visibility.xml b/docs/Mono.Android/en/Android.Transitions/Visibility.xml
index 59ab62849e..73cab6e49e 100644
--- a/docs/Mono.Android/en/Android.Transitions/Visibility.xml
+++ b/docs/Mono.Android/en/Android.Transitions/Visibility.xml
@@ -337,22 +337,19 @@
         <Parameter Name="endValues" Type="Android.Transitions.TransitionValues" />
       </Parameters>
       <Docs>
-        <param name="view">The View to make appear. This will be in the target scene's View hierarchy and
-             will be VISIBLE.</param>
         <param name="sceneRoot">The root of the transition hierarchy</param>
+        <param name="view">The View to make appear. This will be in the target scene's View hierarchy and
+                        will be VISIBLE.</param>
         <param name="startValues">The target values in the start scene</param>
-        <param name="startVisibility">The target visibility in the start scene</param>
         <param name="endValues">The target values in the end scene</param>
-        <param name="endVisibility">The target visibility in the end scene</param>
-        <summary>The default implementation of this method calls
-            <c>#onAppear(ViewGroup, View, TransitionValues, TransitionValues)</c>.</summary>
+        <summary>The default implementation of this method returns a null Animator.</summary>
         <returns>An Animator to be started at the appropriate time in the
             overall transition for this scene change. A null value means no animation
             should be run.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Visibility#onAppear(android.view.ViewGroup,%20android.transition.TransitionValues,%20int,%20android.transition.TransitionValues,%20int)" title="Reference documentation">Java documentation for <code>android.transition.Visibility.onAppear(android.view.ViewGroup, android.transition.TransitionValues, int, android.transition.TransitionValues, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Visibility#onAppear(android.view.ViewGroup,%20android.view.View,%20android.transition.TransitionValues,%20android.transition.TransitionValues)" title="Reference documentation">Java documentation for <code>android.transition.Visibility.onAppear(android.view.ViewGroup, android.view.View, android.transition.TransitionValues, android.transition.TransitionValues)</code>.</a>
             </format>
           </para>
           <para>
@@ -440,24 +437,20 @@
         <Parameter Name="endValues" Type="Android.Transitions.TransitionValues" />
       </Parameters>
       <Docs>
-        <param name="view">The View to make disappear. This will be in the target scene's View
-             hierarchy or in an <see cref="T:Android.Views.ViewGroupOverlay" /> and will be
-             VISIBLE.</param>
         <param name="sceneRoot">The root of the transition hierarchy</param>
+        <param name="view">The View to make disappear. This will be in the target scene's View
+                        hierarchy or in an <c>android.view.ViewGroupOverlay</c> and will be
+                        VISIBLE.</param>
         <param name="startValues">The target values in the start scene</param>
-        <param name="startVisibility">The target visibility in the start scene</param>
         <param name="endValues">The target values in the end scene</param>
-        <param name="endVisibility">The target visibility in the end scene</param>
-        <summary>Subclasses should override this method or
-            <c>#onDisappear(ViewGroup, View, TransitionValues, TransitionValues)</c>
-            if they need to create an Animator when targets disappear.</summary>
+        <summary>The default implementation of this method returns a null Animator.</summary>
         <returns>An Animator to be started at the appropriate time in the
             overall transition for this scene change. A null value means no animation
             should be run.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/transition/Visibility#onDisappear(android.view.ViewGroup,%20android.transition.TransitionValues,%20int,%20android.transition.TransitionValues,%20int)" title="Reference documentation">Java documentation for <code>android.transition.Visibility.onDisappear(android.view.ViewGroup, android.transition.TransitionValues, int, android.transition.TransitionValues, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/transition/Visibility#onDisappear(android.view.ViewGroup,%20android.view.View,%20android.transition.TransitionValues,%20android.transition.TransitionValues)" title="Reference documentation">Java documentation for <code>android.transition.Visibility.onDisappear(android.view.ViewGroup, android.view.View, android.transition.TransitionValues, android.transition.TransitionValues)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util.Proto/ProtoOutputStream.xml b/docs/Mono.Android/en/Android.Util.Proto/ProtoOutputStream.xml
index 89ed706e15..a066b019d7 100644
--- a/docs/Mono.Android/en/Android.Util.Proto/ProtoOutputStream.xml
+++ b/docs/Mono.Android/en/Android.Util.Proto/ProtoOutputStream.xml
@@ -86,11 +86,13 @@
       </Parameters>
       <Docs>
         <param name="chunkSize">To be added.</param>
-        <summary>Construct a <c>ProtoOutputStream</c> with the default chunk size.</summary>
+        <summary>Construct a <c>ProtoOutputStream with the given chunk size.
+            
+            &lt;p&gt;This is for an in-memory proto. The caller should use {@link #getBytes()</c> for the result.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#ProtoOutputStream()" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.ProtoOutputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#ProtoOutputStream(int)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.ProtoOutputStream(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -122,11 +124,11 @@
       </Parameters>
       <Docs>
         <param name="stream">To be added.</param>
-        <summary>Construct a <c>ProtoOutputStream</c> with the default chunk size.</summary>
+        <summary>Construct a <c>ProtoOutputStream</c> that sits on top of an <c>OutputStream</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#ProtoOutputStream()" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.ProtoOutputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#ProtoOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.ProtoOutputStream(java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -1587,11 +1589,11 @@
       <Docs>
         <param name="fieldId">The field identifier constant from the generated class.</param>
         <param name="val">The value.</param>
-        <summary>Write a value for the given fieldId.</summary>
+        <summary>Write a boolean value for the given fieldId.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20double)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20boolean)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1628,11 +1630,11 @@
       <Docs>
         <param name="fieldId">The field identifier constant from the generated class.</param>
         <param name="val">The value.</param>
-        <summary>Write a value for the given fieldId.</summary>
+        <summary>Write a byte[] value for the given fieldId.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20double)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20byte[])" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1714,7 +1716,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20double)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20int)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1755,7 +1757,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20double)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20long)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1796,7 +1798,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20double)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20float)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1833,11 +1835,11 @@
       <Docs>
         <param name="fieldId">The field identifier constant from the generated class.</param>
         <param name="val">The value.</param>
-        <summary>Write a value for the given fieldId.</summary>
+        <summary>Write a string value for the given fieldId.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20double)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream#write(long,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.proto.ProtoOutputStream.write(long, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/ArrayMap.xml b/docs/Mono.Android/en/Android.Util/ArrayMap.xml
index 5f2d87892d..8460fe054f 100644
--- a/docs/Mono.Android/en/Android.Util/ArrayMap.xml
+++ b/docs/Mono.Android/en/Android.Util/ArrayMap.xml
@@ -104,11 +104,11 @@
       </Parameters>
       <Docs>
         <param name="map">To be added.</param>
-        <summary>Create a new empty ArrayMap.</summary>
+        <summary>Create a new ArrayMap with the mappings from the given ArrayMap.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArrayMap#ArrayMap()" title="Reference documentation">Java documentation for <code>android.util.ArrayMap.ArrayMap()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArrayMap#ArrayMap(android.util.ArrayMap)" title="Reference documentation">Java documentation for <code>android.util.ArrayMap.ArrayMap(android.util.ArrayMap)</code>.</a>
             </format>
           </para>
           <para>
@@ -140,11 +140,11 @@
       </Parameters>
       <Docs>
         <param name="capacity">To be added.</param>
-        <summary>Create a new empty ArrayMap.</summary>
+        <summary>Create a new ArrayMap with a given initial capacity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArrayMap#ArrayMap()" title="Reference documentation">Java documentation for <code>android.util.ArrayMap.ArrayMap()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArrayMap#ArrayMap(int)" title="Reference documentation">Java documentation for <code>android.util.ArrayMap.ArrayMap(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -794,13 +794,12 @@
         <Parameter Name="map" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="map">To be added.</param>
-        <param name="array">The array whose contents are to be retrieved.</param>
-        <summary>Perform a <c>#put(Object, Object)</c> of all key/value pairs in &lt;var&gt;array&lt;/var&gt;</summary>
+        <param name="map">The map whose contents are to be retrieved.</param>
+        <summary>Perform a <c>#put(Object, Object)</c> of all key/value pairs in &lt;var&gt;map&lt;/var&gt;</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArrayMap#putAll(android.util.ArrayMap)" title="Reference documentation">Java documentation for <code>android.util.ArrayMap.putAll(android.util.ArrayMap)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArrayMap#putAll(java.util.Map)" title="Reference documentation">Java documentation for <code>android.util.ArrayMap.putAll(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/ArraySet.xml b/docs/Mono.Android/en/Android.Util/ArraySet.xml
index a4bb9b1909..5e7f321300 100644
--- a/docs/Mono.Android/en/Android.Util/ArraySet.xml
+++ b/docs/Mono.Android/en/Android.Util/ArraySet.xml
@@ -110,11 +110,11 @@
       </Parameters>
       <Docs>
         <param name="set">To be added.</param>
-        <summary>Create a new empty ArraySet.</summary>
+        <summary>Create a new ArraySet with the mappings from the given ArraySet.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet()" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet(android.util.ArraySet)" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet(android.util.ArraySet)</code>.</a>
             </format>
           </para>
           <para>
@@ -146,11 +146,11 @@
       </Parameters>
       <Docs>
         <param name="array">To be added.</param>
-        <summary>Create a new empty ArraySet.</summary>
+        <summary>Create a new ArraySet with items from the given array</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet()" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet(java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -182,11 +182,11 @@
       </Parameters>
       <Docs>
         <param name="set">To be added.</param>
-        <summary>Create a new empty ArraySet.</summary>
+        <summary>Create a new ArraySet with items from the given collection.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet()" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet(java.util.Collection)" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -218,11 +218,11 @@
       </Parameters>
       <Docs>
         <param name="capacity">To be added.</param>
-        <summary>Create a new empty ArraySet.</summary>
+        <summary>Create a new ArraySet with a given initial capacity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet()" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArraySet#ArraySet(int)" title="Reference documentation">Java documentation for <code>android.util.ArraySet.ArraySet(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -344,14 +344,13 @@
         <Parameter Name="collection" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="collection">To be added.</param>
-        <param name="array">The array whose contents are to be retrieved.</param>
-        <summary>Perform a <c>#add(Object)</c> of all values in &lt;var&gt;array&lt;/var&gt;</summary>
+        <param name="collection">The collection whose contents are to be retrieved.</param>
+        <summary>Perform an <c>#add(Object)</c> of all values in &lt;var&gt;collection&lt;/var&gt;</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArraySet#addAll(android.util.ArraySet)" title="Reference documentation">Java documentation for <code>android.util.ArraySet.addAll(android.util.ArraySet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArraySet#addAll(java.util.Collection)" title="Reference documentation">Java documentation for <code>android.util.ArraySet.addAll(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -798,14 +797,13 @@
         <Parameter Name="collection" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="collection">To be added.</param>
-        <param name="array">The array whose contents are to be removed.</param>
-        <summary>Perform a <c>#remove(Object)</c> of all values in &lt;var&gt;array&lt;/var&gt;</summary>
-        <returns>To be added.</returns>
+        <param name="collection">The collection whose contents are to be used to remove values.</param>
+        <summary>Remove all values in the array set that exist in the given collection.</summary>
+        <returns>Returns true if any values were removed from the array set, else false.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/ArraySet#removeAll(android.util.ArraySet)" title="Reference documentation">Java documentation for <code>android.util.ArraySet.removeAll(android.util.ArraySet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/ArraySet#removeAll(java.util.Collection)" title="Reference documentation">Java documentation for <code>android.util.ArraySet.removeAll(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/Base64.xml b/docs/Mono.Android/en/Android.Util/Base64.xml
index 6e7c7e41a9..38037db813 100644
--- a/docs/Mono.Android/en/Android.Util/Base64.xml
+++ b/docs/Mono.Android/en/Android.Util/Base64.xml
@@ -132,8 +132,6 @@
       </Parameters>
       <Docs>
         <param name="input">the input array to decode</param>
-        <param name="str">the input String to decode, which is converted to
-                          bytes using the default charset</param>
         <param name="flags">controls certain features of the decoded output.
                           Pass <c>DEFAULT</c> to decode standard Base64.</param>
         <summary>Decode the Base64-encoded data in input and return the data in
@@ -142,7 +140,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Base64#decode(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.decode(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Base64#decode(byte[],%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.decode(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -249,8 +247,6 @@
         <param name="input">the data to decode</param>
         <param name="offset">the position within the input array at which to start</param>
         <param name="len">the number of bytes of input to decode</param>
-        <param name="str">the input String to decode, which is converted to
-                          bytes using the default charset</param>
         <param name="flags">controls certain features of the decoded output.
                           Pass <c>DEFAULT</c> to decode standard Base64.</param>
         <summary>Decode the Base64-encoded data in input and return the data in
@@ -259,7 +255,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Base64#decode(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.decode(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Base64#decode(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.decode(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -401,10 +397,10 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="input">the data to encode</param>
         <param name="offset">the position within the input array at which to
-               start</param>
+                          start</param>
         <param name="len">the number of bytes of input to encode</param>
-        <param name="input">the data to encode</param>
         <param name="flags">controls certain features of the encoded output.
                           Passing <c>DEFAULT</c> results in output that
                           adheres to RFC 2045.</param>
@@ -414,7 +410,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Base64#encode(byte[],%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.encode(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Base64#encode(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.encode(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -512,10 +508,10 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="input">the data to encode</param>
         <param name="offset">the position within the input array at which to
-               start</param>
+                          start</param>
         <param name="len">the number of bytes of input to encode</param>
-        <param name="input">the data to encode</param>
         <param name="flags">controls certain features of the encoded output.
                           Passing <c>DEFAULT</c> results in output that
                           adheres to RFC 2045.</param>
@@ -525,7 +521,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Base64#encodeToString(byte[],%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.encodeToString(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Base64#encodeToString(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.util.Base64.encodeToString(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/EventLog.xml b/docs/Mono.Android/en/Android.Util/EventLog.xml
index e31ed59ace..d870594f4c 100644
--- a/docs/Mono.Android/en/Android.Util/EventLog.xml
+++ b/docs/Mono.Android/en/Android.Util/EventLog.xml
@@ -354,9 +354,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="list">To be added.</param>
         <param name="tag">The event type tag code</param>
-        <param name="value">A value to log</param>
+        <param name="list">To be added.</param>
         <summary>Record an event log message.</summary>
         <returns>The number of bytes written</returns>
         <remarks>
@@ -405,7 +404,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/EventLog#writeEvent(int,%20float)" title="Reference documentation">Java documentation for <code>android.util.EventLog.writeEvent(int, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/EventLog#writeEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.util.EventLog.writeEvent(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -448,7 +447,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/EventLog#writeEvent(int,%20float)" title="Reference documentation">Java documentation for <code>android.util.EventLog.writeEvent(int, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/EventLog#writeEvent(int,%20long)" title="Reference documentation">Java documentation for <code>android.util.EventLog.writeEvent(int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -526,15 +525,14 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="str">A value to log</param>
         <param name="tag">The event type tag code</param>
-        <param name="value">A value to log</param>
+        <param name="str">A value to log</param>
         <summary>Record an event log message.</summary>
         <returns>The number of bytes written</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/EventLog#writeEvent(int,%20float)" title="Reference documentation">Java documentation for <code>android.util.EventLog.writeEvent(int, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/EventLog#writeEvent(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.EventLog.writeEvent(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/Half.xml b/docs/Mono.Android/en/Android.Util/Half.xml
index 4c8ef1ab36..f27efd43c9 100644
--- a/docs/Mono.Android/en/Android.Util/Half.xml
+++ b/docs/Mono.Android/en/Android.Util/Half.xml
@@ -105,12 +105,12 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be represented by the <c>Half</c></param>
-        <summary>Constructs a newly allocated <c>Half</c> object that
-            represents the argument converted to a half-precision float.</summary>
+        <summary>Constructs a newly allocated <c>Half</c> object that represents the
+            half-precision float type argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#Half(double)" title="Reference documentation">Java documentation for <code>android.util.Half.Half(double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#Half(short)" title="Reference documentation">Java documentation for <code>android.util.Half.Half(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -142,12 +142,12 @@
       </Parameters>
       <Docs>
         <param name="value">The value to be represented by the <c>Half</c></param>
-        <summary>Constructs a newly allocated <c>Half</c> object that
-            represents the argument converted to a half-precision float.</summary>
+        <summary>Constructs a newly allocated <c>Half</c> object that represents the
+            argument converted to a half-precision float.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#Half(double)" title="Reference documentation">Java documentation for <code>android.util.Half.Half(double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#Half(float)" title="Reference documentation">Java documentation for <code>android.util.Half.Half(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -178,13 +178,13 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="value">The value to be represented by the <c>Half</c></param>
-        <summary>Constructs a newly allocated <c>Half</c> object that
-            represents the argument converted to a half-precision float.</summary>
+        <param name="value">A string to be converted to a <c>Half</c></param>
+        <summary>Constructs a newly allocated <c>Half</c> object that represents the
+            half-precision float value represented by the string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#Half(double)" title="Reference documentation">Java documentation for <code>android.util.Half.Half(double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#Half(java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.Half.Half(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -508,15 +508,14 @@
         <Parameter Name="y" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <param name="y">To be added.</param>
-        <param name="o">The object to compare</param>
-        <summary>Compares this object against the specified object.</summary>
-        <returns>True if the objects are the same, false otherwise</returns>
+        <param name="x">The first half-precision value</param>
+        <param name="y">The second half-precision value</param>
+        <summary>Returns true if the two half-precision float values are equal.</summary>
+        <returns>True if x is equal to y, false otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#equals(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.util.Half.equals(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#equals(short,%20short)" title="Reference documentation">Java documentation for <code>android.util.Half.equals(short, short)</code>.</a>
             </format>
           </para>
           <para>
@@ -1001,13 +1000,13 @@
         <Parameter Name="h" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="h">To be added.</param>
-        <summary>Returns a hash code for this <c>Half</c> object.</summary>
-        <returns>A hash code value for this object</returns>
+        <param name="h">The value to hash</param>
+        <summary>Returns a hash code for a half-precision float value.</summary>
+        <returns>A hash code value for a half-precision float value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#hashCode()" title="Reference documentation">Java documentation for <code>android.util.Half.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#hashCode(short)" title="Reference documentation">Java documentation for <code>android.util.Half.hashCode(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -1121,14 +1120,14 @@
         <Parameter Name="h" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="h">To be added.</param>
-        <summary>Returns true if this <c>Half</c> value represents a Not-a-Number,
-            false otherwise.</summary>
+        <param name="h">A half-precision float value</param>
+        <summary>Returns true if the specified half-precision float value represents
+            a Not-a-Number, false otherwise.</summary>
         <returns>True if the value is a NaN, false otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#isNaN()" title="Reference documentation">Java documentation for <code>android.util.Half.isNaN()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#isNaN(short)" title="Reference documentation">Java documentation for <code>android.util.Half.isNaN(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -2255,14 +2254,14 @@
         <Parameter Name="h" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="h">To be added.</param>
+        <param name="h">A half-precision float value</param>
         <summary>Returns a string representation of the specified half-precision
             float value.</summary>
-        <returns>A string representation of this <c>Half</c> object</returns>
+        <returns>A string representation of the specified value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#toString()" title="Reference documentation">Java documentation for <code>android.util.Half.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#toString(short)" title="Reference documentation">Java documentation for <code>android.util.Half.toString(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -2338,14 +2337,14 @@
         <Parameter Name="h" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="h">To be added.</param>
-        <param name="f">A float value</param>
-        <summary>Returns a <c>Half</c> instance representing the specified float value.</summary>
-        <returns>a <c>Half</c> instance representing <c>f</c></returns>
+        <param name="h">A half-precision float value</param>
+        <summary>Returns a <c>Half</c> instance representing the specified
+            half-precision float value.</summary>
+        <returns>a <c>Half</c> instance representing <c>h</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#valueOf(float)" title="Reference documentation">Java documentation for <code>android.util.Half.valueOf(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#valueOf(short)" title="Reference documentation">Java documentation for <code>android.util.Half.valueOf(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -2419,14 +2418,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="f">A float value</param>
-        <summary>Returns a <c>Half</c> instance representing the specified float value.</summary>
-        <returns>a <c>Half</c> instance representing <c>f</c></returns>
+        <param name="s">The string to be parsed</param>
+        <summary>Returns a <c>Half</c> instance representing the specified string value.</summary>
+        <returns>a <c>Half</c> instance representing <c>h</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Half#valueOf(float)" title="Reference documentation">Java documentation for <code>android.util.Half.valueOf(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Half#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.Half.valueOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/IAttributeSet.xml b/docs/Mono.Android/en/Android.Util/IAttributeSet.xml
index 283566b747..b7851e7007 100644
--- a/docs/Mono.Android/en/Android.Util/IAttributeSet.xml
+++ b/docs/Mono.Android/en/Android.Util/IAttributeSet.xml
@@ -168,14 +168,13 @@
       <Docs>
         <param name="namespace">Namespace of attribute to retrieve.</param>
         <param name="attribute">The attribute to retrieve.</param>
-        <param name="index">Index of the desired attribute, 0...count-1.</param>
         <param name="defaultValue">What to return if the attribute isn't found.</param>
-        <summary>Return the boolean value of attribute at 'index'.</summary>
+        <summary>Return the boolean value of 'attribute'.</summary>
         <returns>Resulting value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeBooleanValue(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeBooleanValue(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeBooleanValue(java.lang.String,%20java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeBooleanValue(java.lang.String, java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -257,14 +256,13 @@
       <Docs>
         <param name="namespace">Namespace of attribute to retrieve.</param>
         <param name="attribute">The attribute to retrieve.</param>
-        <param name="index">Index of the desired attribute, 0...count-1.</param>
         <param name="defaultValue">What to return if the attribute isn't found.</param>
-        <summary>Return the float value of attribute at 'index'.</summary>
+        <summary>Return the float value of 'attribute'.</summary>
         <returns>Resulting value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeFloatValue(int,%20float)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeFloatValue(int, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeFloatValue(java.lang.String,%20java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeFloatValue(java.lang.String, java.lang.String, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -346,14 +344,13 @@
       <Docs>
         <param name="namespace">Namespace of attribute to retrieve.</param>
         <param name="attribute">The attribute to retrieve.</param>
-        <param name="index">Index of the desired attribute, 0...count-1.</param>
         <param name="defaultValue">What to return if the attribute isn't found.</param>
-        <summary>Return the integer value of attribute at 'index'.</summary>
+        <summary>Return the integer value of 'attribute'.</summary>
         <returns>Resulting value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeIntValue(int,%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeIntValue(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeIntValue(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeIntValue(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -440,17 +437,15 @@
       <Docs>
         <param name="namespace">Namespace of attribute to retrieve.</param>
         <param name="attribute">Name of attribute to retrieve.</param>
-        <param name="index">Index of the desired attribute, 0...count-1.</param>
         <param name="options">List of strings whose values we are checking against.</param>
         <param name="defaultValue">Value returned if attribute doesn't exist or no
                                 match is found.</param>
-        <summary>Return the index of the value of attribute at 'index' in the list 
-            'options'.</summary>
+        <summary>Return the index of the value of 'attribute' in the list 'options'.</summary>
         <returns>Index in to 'options' or defaultValue.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeListValue(int,%20java.lang.String[],%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeListValue(int, java.lang.String[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeListValue(java.lang.String,%20java.lang.String,%20java.lang.String[],%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeListValue(java.lang.String, java.lang.String, java.lang.String[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -656,14 +651,13 @@
       <Docs>
         <param name="namespace">Namespace of attribute to retrieve.</param>
         <param name="attribute">The attribute to retrieve.</param>
-        <param name="index">Index of the desired attribute, 0...count-1.</param>
         <param name="defaultValue">What to return if the attribute isn't found.</param>
-        <summary>Return the value of attribute at 'index' as a resource identifier.</summary>
+        <summary>Return the value of 'attribute' as a resource identifier.</summary>
         <returns>Resulting value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeResourceValue(int,%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeResourceValue(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeResourceValue(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeResourceValue(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -746,15 +740,14 @@
       <Docs>
         <param name="namespace">Namespace of attribute to retrieve.</param>
         <param name="attribute">The attribute to retrieve.</param>
-        <param name="index">Index of the desired attribute, 0...count-1.</param>
         <param name="defaultValue">What to return if the attribute isn't found.</param>
-        <summary>Return the integer value of attribute at 'index' that is formatted as an
+        <summary>Return the boolean value of 'attribute' that is formatted as an
             unsigned value.</summary>
         <returns>Resulting value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeUnsignedIntValue(int,%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeUnsignedIntValue(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeUnsignedIntValue(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeUnsignedIntValue(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -834,14 +827,13 @@
       <Docs>
         <param name="namespace">The namespace of the attribute to get the value from.</param>
         <param name="name">The name of the attribute to get the value from.</param>
-        <param name="index">Index of the desired attribute, 0...count-1.</param>
         <summary>Returns the value of the specified attribute as a string representation.</summary>
         <returns>A String containing the value of the attribute, or null if the
                     attribute cannot be found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeValue(int)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/AttributeSet#getAttributeValue(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.AttributeSet.getAttributeValue(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/JsonWriter.xml b/docs/Mono.Android/en/Android.Util/JsonWriter.xml
index d926c181f0..f0fc178085 100644
--- a/docs/Mono.Android/en/Android.Util/JsonWriter.xml
+++ b/docs/Mono.Android/en/Android.Util/JsonWriter.xml
@@ -774,7 +774,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(double)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(java.lang.Number)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(java.lang.Number)</code>.</a>
             </format>
           </para>
           <para>
@@ -817,7 +817,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(double)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(boolean)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -903,7 +903,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(double)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(long)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -939,14 +939,13 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
-                <c>Double#isInfinite() infinities</c> unless this writer is lenient.</param>
+        <param name="value">the literal string value, or null to encode a null literal.</param>
         <summary>Encodes <c>value</c>.</summary>
         <returns>this writer.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(double)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(double)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/JsonWriter#value(java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.JsonWriter.value(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/Log.xml b/docs/Mono.Android/en/Android.Util/Log.xml
index 616ca285d9..7f4a4c5dd8 100644
--- a/docs/Mono.Android/en/Android.Util/Log.xml
+++ b/docs/Mono.Android/en/Android.Util/Log.xml
@@ -823,10 +823,9 @@
         <Parameter Name="tr" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="tr">To be added.</param>
         <param name="tag">Used to identify the source of a log message.  It usually identifies
                    the class or activity where the log call occurs.</param>
-        <param name="msg">The message you would like logged.</param>
+        <param name="tr">To be added.</param>
         <summary>Send a <c>#WARN</c> log message.</summary>
         <returns>To be added.</returns>
         <remarks>
@@ -1025,12 +1024,21 @@
       <Docs>
         <param name="priority">The priority/type of this log message</param>
         <param name="tag">Used to identify the source of a log message.  It usually identifies
-        the class or activity where the log call occurs.</param>
+                   the class or activity where the log call occurs.</param>
         <param name="msg">The message you would like logged.</param>
         <summary>Low-level logging call.</summary>
-        <returns>To be added.</returns>
+        <returns>The number of bytes written.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/util/Log#println(int,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.Log.println(int, java.lang.String, java.lang.String)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Util/LongSparseArray.xml b/docs/Mono.Android/en/Android.Util/LongSparseArray.xml
index f628f56c4d..334b3f8e80 100644
--- a/docs/Mono.Android/en/Android.Util/LongSparseArray.xml
+++ b/docs/Mono.Android/en/Android.Util/LongSparseArray.xml
@@ -105,11 +105,13 @@
       </Parameters>
       <Docs>
         <param name="initialCapacity">To be added.</param>
-        <summary>Creates a new LongSparseArray containing no mappings.</summary>
+        <summary>Creates a new LongSparseArray containing no mappings that will not
+            require any additional memory allocation to store the specified
+            number of mappings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/LongSparseArray#LongSparseArray()" title="Reference documentation">Java documentation for <code>android.util.LongSparseArray.LongSparseArray()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/LongSparseArray#LongSparseArray(int)" title="Reference documentation">Java documentation for <code>android.util.LongSparseArray.LongSparseArray(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -360,13 +362,13 @@
       <Docs>
         <param name="key">To be added.</param>
         <param name="valueIfKeyNotFound">To be added.</param>
-        <summary>Gets the Object mapped from the specified key, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Gets the Object mapped from the specified key, or the specified Object
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/LongSparseArray#get(long)" title="Reference documentation">Java documentation for <code>android.util.LongSparseArray.get(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/LongSparseArray#get(long,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.util.LongSparseArray.get(long, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/MonthDisplayHelper.xml b/docs/Mono.Android/en/Android.Util/MonthDisplayHelper.xml
index 72e5a98121..79348f41f0 100644
--- a/docs/Mono.Android/en/Android.Util/MonthDisplayHelper.xml
+++ b/docs/Mono.Android/en/Android.Util/MonthDisplayHelper.xml
@@ -58,7 +58,6 @@
       <Docs>
         <param name="year">The year.</param>
         <param name="month">The month.</param>
-        <param name="weekStartDay">What day of the week the week should start.</param>
         <summary>
         </summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Util/Range.xml b/docs/Mono.Android/en/Android.Util/Range.xml
index dadb9bfe3a..3716533342 100644
--- a/docs/Mono.Android/en/Android.Util/Range.xml
+++ b/docs/Mono.Android/en/Android.Util/Range.xml
@@ -180,15 +180,14 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <param name="range">a non-<c>null</c><c>T</c> reference</param>
-        <summary>Checks if another <c>range</c> is within the bounds of this range.</summary>
+        <param name="value">a non-<c>null</c><c>T</c> reference</param>
+        <summary>Checks if the <c>value</c> is within the bounds of this range.</summary>
         <returns>
-          <c>true</c> if the range is within this inclusive range, <c>false</c> otherwise</returns>
+          <c>true</c> if the value is within this inclusive range, <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Range#contains(android.util.Range)" title="Reference documentation">Java documentation for <code>android.util.Range.contains(android.util.Range)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Range#contains(java.lang.Comparable)" title="Reference documentation">Java documentation for <code>android.util.Range.contains(java.lang.Comparable)</code>.</a>
             </format>
           </para>
           <para>
@@ -309,15 +308,14 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <param name="range">a non-<c>null</c><c>Range&lt;T&gt;</c> reference</param>
+        <param name="value">a non-<c>null</c><c>T</c> reference</param>
         <summary>Returns the smallest range that includes this range and
-            another <c>range</c>.</summary>
-        <returns>the extension of this range and the other range.</returns>
+            the <c>value</c>.</summary>
+        <returns>the extension of this range and the value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Range#extend(android.util.Range)" title="Reference documentation">Java documentation for <code>android.util.Range.extend(android.util.Range)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Range#extend(java.lang.Comparable)" title="Reference documentation">Java documentation for <code>android.util.Range.extend(java.lang.Comparable)</code>.</a>
             </format>
           </para>
           <para>
@@ -352,16 +350,15 @@
         <Parameter Name="upper" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="lower">To be added.</param>
-        <param name="upper">To be added.</param>
-        <param name="range">a non-<c>null</c><c>Range&lt;T&gt;</c> reference</param>
+        <param name="lower">a non-<c>null</c><c>T</c> reference</param>
+        <param name="upper">a non-<c>null</c><c>T</c> reference</param>
         <summary>Returns the smallest range that includes this range and
-            another <c>range</c>.</summary>
+            the inclusive range specified by <c>[lower, upper]</c>.</summary>
         <returns>the extension of this range and the other range.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Range#extend(android.util.Range)" title="Reference documentation">Java documentation for <code>android.util.Range.extend(android.util.Range)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Range#extend(java.lang.Comparable,%20java.lang.Comparable)" title="Reference documentation">Java documentation for <code>android.util.Range.extend(java.lang.Comparable, java.lang.Comparable)</code>.</a>
             </format>
           </para>
           <para>
@@ -436,15 +433,15 @@
         <Parameter Name="upper" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="lower">To be added.</param>
-        <param name="upper">To be added.</param>
-        <param name="range">a non-<c>null</c><c>Range&lt;T&gt;</c> reference</param>
-        <summary>Returns the intersection of this range and another <c>range</c>.</summary>
-        <returns>the intersection of this range and the other range.</returns>
+        <param name="lower">a non-<c>null</c><c>T</c> reference</param>
+        <param name="upper">a non-<c>null</c><c>T</c> reference</param>
+        <summary>Returns the intersection of this range and the inclusive range
+            specified by <c>[lower, upper]</c>.</summary>
+        <returns>the intersection of this range and the other range</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Range#intersect(android.util.Range)" title="Reference documentation">Java documentation for <code>android.util.Range.intersect(android.util.Range)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Range#intersect(java.lang.Comparable,%20java.lang.Comparable)" title="Reference documentation">Java documentation for <code>android.util.Range.intersect(java.lang.Comparable, java.lang.Comparable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/SparseArray.xml b/docs/Mono.Android/en/Android.Util/SparseArray.xml
index 4eeae30d5d..2a8555e40f 100644
--- a/docs/Mono.Android/en/Android.Util/SparseArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseArray.xml
@@ -106,11 +106,13 @@
       </Parameters>
       <Docs>
         <param name="initialCapacity">To be added.</param>
-        <summary>Creates a new SparseArray containing no mappings.</summary>
+        <summary>Creates a new SparseArray containing no mappings that will not
+            require any additional memory allocation to store the specified
+            number of mappings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseArray#SparseArray()" title="Reference documentation">Java documentation for <code>android.util.SparseArray.SparseArray()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseArray#SparseArray(int)" title="Reference documentation">Java documentation for <code>android.util.SparseArray.SparseArray(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -479,13 +481,13 @@
       <Docs>
         <param name="key">To be added.</param>
         <param name="valueIfKeyNotFound">To be added.</param>
-        <summary>Gets the Object mapped from the specified key, or &lt;code&gt;null&lt;/code&gt;
+        <summary>Gets the Object mapped from the specified key, or the specified Object
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseArray#get(int)" title="Reference documentation">Java documentation for <code>android.util.SparseArray.get(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseArray#get(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.util.SparseArray.get(int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml b/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml
index 80e61b2447..39fb61e483 100644
--- a/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseBooleanArray.xml
@@ -101,11 +101,13 @@
       </Parameters>
       <Docs>
         <param name="initialCapacity">To be added.</param>
-        <summary>Creates a new SparseBooleanArray containing no mappings.</summary>
+        <summary>Creates a new SparseBooleanArray containing no mappings that will not
+            require any additional memory allocation to store the specified
+            number of mappings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseBooleanArray#SparseBooleanArray()" title="Reference documentation">Java documentation for <code>android.util.SparseBooleanArray.SparseBooleanArray()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseBooleanArray#SparseBooleanArray(int)" title="Reference documentation">Java documentation for <code>android.util.SparseBooleanArray.SparseBooleanArray(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -357,13 +359,13 @@
       <Docs>
         <param name="key">To be added.</param>
         <param name="valueIfKeyNotFound">To be added.</param>
-        <summary>Gets the boolean mapped from the specified key, or &lt;code&gt;false&lt;/code&gt;
+        <summary>Gets the boolean mapped from the specified key, or the specified value
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseBooleanArray#get(int)" title="Reference documentation">Java documentation for <code>android.util.SparseBooleanArray.get(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseBooleanArray#get(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.util.SparseBooleanArray.get(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/SparseIntArray.xml b/docs/Mono.Android/en/Android.Util/SparseIntArray.xml
index 166902eba5..76b5ad771c 100644
--- a/docs/Mono.Android/en/Android.Util/SparseIntArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseIntArray.xml
@@ -101,11 +101,13 @@
       </Parameters>
       <Docs>
         <param name="initialCapacity">To be added.</param>
-        <summary>Creates a new SparseIntArray containing no mappings.</summary>
+        <summary>Creates a new SparseIntArray containing no mappings that will not
+            require any additional memory allocation to store the specified
+            number of mappings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseIntArray#SparseIntArray()" title="Reference documentation">Java documentation for <code>android.util.SparseIntArray.SparseIntArray()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseIntArray#SparseIntArray(int)" title="Reference documentation">Java documentation for <code>android.util.SparseIntArray.SparseIntArray(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -357,13 +359,13 @@
       <Docs>
         <param name="key">To be added.</param>
         <param name="valueIfKeyNotFound">To be added.</param>
-        <summary>Gets the int mapped from the specified key, or &lt;code&gt;0&lt;/code&gt;
+        <summary>Gets the int mapped from the specified key, or the specified value
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseIntArray#get(int)" title="Reference documentation">Java documentation for <code>android.util.SparseIntArray.get(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseIntArray#get(int,%20int)" title="Reference documentation">Java documentation for <code>android.util.SparseIntArray.get(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/SparseLongArray.xml b/docs/Mono.Android/en/Android.Util/SparseLongArray.xml
index 722a2e1b2d..f32812f16a 100644
--- a/docs/Mono.Android/en/Android.Util/SparseLongArray.xml
+++ b/docs/Mono.Android/en/Android.Util/SparseLongArray.xml
@@ -101,11 +101,13 @@
       </Parameters>
       <Docs>
         <param name="initialCapacity">To be added.</param>
-        <summary>Creates a new SparseLongArray containing no mappings.</summary>
+        <summary>Creates a new SparseLongArray containing no mappings that will not
+            require any additional memory allocation to store the specified
+            number of mappings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseLongArray#SparseLongArray()" title="Reference documentation">Java documentation for <code>android.util.SparseLongArray.SparseLongArray()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseLongArray#SparseLongArray(int)" title="Reference documentation">Java documentation for <code>android.util.SparseLongArray.SparseLongArray(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -357,13 +359,13 @@
       <Docs>
         <param name="key">To be added.</param>
         <param name="valueIfKeyNotFound">To be added.</param>
-        <summary>Gets the long mapped from the specified key, or &lt;code&gt;0&lt;/code&gt;
+        <summary>Gets the long mapped from the specified key, or the specified value
             if no such mapping has been made.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/SparseLongArray#get(int)" title="Reference documentation">Java documentation for <code>android.util.SparseLongArray.get(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/SparseLongArray#get(int,%20long)" title="Reference documentation">Java documentation for <code>android.util.SparseLongArray.get(int, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/StateSet.xml b/docs/Mono.Android/en/Android.Util/StateSet.xml
index 0dc693d141..eb9d91da4e 100644
--- a/docs/Mono.Android/en/Android.Util/StateSet.xml
+++ b/docs/Mono.Android/en/Android.Util/StateSet.xml
@@ -291,17 +291,15 @@
         <Parameter Name="stateSet" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="stateSet">an array of <see cref="T:Android.Views.View" /> states
-</param>
         <param name="stateSpec">an array of required (if positive) or
                    prohibited (if negative) <c>android.view.View</c> states.</param>
-        <param name="state">a <c>android.view.View</c> state</param>
-        <summary>Return whether the state matches the desired stateSpec.</summary>
+        <param name="stateSet">an array of <c>android.view.View</c> states</param>
+        <summary>Return whether the stateSet matches the desired stateSpec.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/StateSet#stateSetMatches(int[],%20int)" title="Reference documentation">Java documentation for <code>android.util.StateSet.stateSetMatches(int[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/StateSet#stateSetMatches(int[],%20int[])" title="Reference documentation">Java documentation for <code>android.util.StateSet.stateSetMatches(int[], int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/TimingLogger.xml b/docs/Mono.Android/en/Android.Util/TimingLogger.xml
index 40abc2e75f..78136a1b3a 100644
--- a/docs/Mono.Android/en/Android.Util/TimingLogger.xml
+++ b/docs/Mono.Android/en/Android.Util/TimingLogger.xml
@@ -293,15 +293,13 @@
       </Parameters>
       <Docs>
         <param name="tag">the log tag to use while logging the timings</param>
-        <param name="label">a string to be displayed with each log
-</param>
+        <param name="label">a string to be displayed with each log</param>
         <summary>Clear and initialize a TimingLogger object that will log using
-            the tag and label that was specified previously, either via
-            the constructor or a call to reset(tag, label).</summary>
+            the specific tag.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/TimingLogger#reset()" title="Reference documentation">Java documentation for <code>android.util.TimingLogger.reset()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/TimingLogger#reset(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.util.TimingLogger.reset(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/TypedValue.xml b/docs/Mono.Android/en/Android.Util/TypedValue.xml
index abd1d4bd69..11d4f3e78f 100644
--- a/docs/Mono.Android/en/Android.Util/TypedValue.xml
+++ b/docs/Mono.Android/en/Android.Util/TypedValue.xml
@@ -280,14 +280,14 @@
       <Docs>
         <param name="type">The data type identifier.</param>
         <param name="data">The data value.</param>
-        <summary>Regardless of the actual type of the value, try to convert it to a
-            string value.</summary>
-        <returns>CharSequence The coerced string value.  If the value is
+        <summary>Perform type conversion as per <c>#coerceToString()</c> on an
+            explicitly supplied type and data.</summary>
+        <returns>String The coerced string value.  If the value is
                     null or the type is not known, null is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/TypedValue#coerceToString()" title="Reference documentation">Java documentation for <code>android.util.TypedValue.coerceToString()</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/TypedValue#coerceToString(int,%20int)" title="Reference documentation">Java documentation for <code>android.util.TypedValue.coerceToString(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Util/Xml.xml b/docs/Mono.Android/en/Android.Util/Xml.xml
index f79e2e0d11..a9b2498472 100644
--- a/docs/Mono.Android/en/Android.Util/Xml.xml
+++ b/docs/Mono.Android/en/Android.Util/Xml.xml
@@ -338,12 +338,12 @@
       <Docs>
         <param name="in">To be added.</param>
         <param name="contentHandler">To be added.</param>
-        <summary>Parses xml from the given input stream and fires events on the given SAX
+        <summary>Parses xml from the given reader and fires events on the given SAX
             handler.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Xml#parse(java.io.InputStream,%20android.util.Encoding,%20org.xml.sax.ContentHandler)" title="Reference documentation">Java documentation for <code>android.util.Xml.parse(java.io.InputStream, android.util.Encoding, org.xml.sax.ContentHandler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Xml#parse(java.io.Reader,%20org.xml.sax.ContentHandler)" title="Reference documentation">Java documentation for <code>android.util.Xml.parse(java.io.Reader, org.xml.sax.ContentHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -383,12 +383,11 @@
       <Docs>
         <param name="xml">To be added.</param>
         <param name="contentHandler">To be added.</param>
-        <summary>Parses xml from the given input stream and fires events on the given SAX
-            handler.</summary>
+        <summary>Parses the given xml string and fires events on the given SAX handler.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/util/Xml#parse(java.io.InputStream,%20android.util.Encoding,%20org.xml.sax.ContentHandler)" title="Reference documentation">Java documentation for <code>android.util.Xml.parse(java.io.InputStream, android.util.Encoding, org.xml.sax.ContentHandler)</code>.</a>
+              <a href="https://developer.android.com/reference/android/util/Xml#parse(java.lang.String,%20org.xml.sax.ContentHandler)" title="Reference documentation">Java documentation for <code>android.util.Xml.parse(java.lang.String, org.xml.sax.ContentHandler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml
index d6ba347e75..4f26b2fd8c 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityEvent.xml
@@ -101,11 +101,12 @@
       </Parameters>
       <Docs>
         <param name="e">To be added.</param>
-        <summary>Creates a new <c>AccessibilityEvent</c>.</summary>
+        <param name="event">The other event.</param>
+        <summary>Copy constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#AccessibilityEvent()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.AccessibilityEvent()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#AccessibilityEvent(android.view.accessibility.AccessibilityEvent)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.AccessibilityEvent(android.view.accessibility.AccessibilityEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -136,12 +137,12 @@
         <Parameter Name="eventType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="eventType">To be added.</param>
-        <summary>Creates a new <c>AccessibilityEvent</c>.</summary>
+        <param name="eventType">The event type.</param>
+        <summary>Creates a new <c>AccessibilityEvent</c> with the given &lt;code&gt;eventType&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#AccessibilityEvent()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.AccessibilityEvent()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#AccessibilityEvent(int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.AccessibilityEvent(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1636,13 +1637,14 @@
       </Parameters>
       <Docs>
         <param name="e">The other event.</param>
+        <param name="event">The other event.</param>
         <summary>Returns a cached instance if such is available or a new one is
-            instantiated.</summary>
+            created.</summary>
         <returns>An instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#obtain()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#obtain(android.view.accessibility.AccessibilityEvent)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.obtain(android.view.accessibility.AccessibilityEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -1686,12 +1688,12 @@
       <Docs>
         <param name="eventType">The event type.</param>
         <summary>Returns a cached instance if such is available or a new one is
-            instantiated.</summary>
+            instantiated with its type property set.</summary>
         <returns>An instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#obtain()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent#obtain(int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityEvent.obtain(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityManager.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityManager.xml
index 912f2e0d78..216e8544e9 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityManager.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityManager.xml
@@ -239,8 +239,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">The listener.</param>
+        <param name="handler">To be added.</param>
         <summary>Registers an <c>AccessibilityStateChangeListener</c> for changes in
             the global accessibility state of the system.</summary>
         <returns>True if successfully registered.</returns>
@@ -323,8 +323,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="listener">The listener.</param>
+        <param name="handler">To be added.</param>
         <summary>Registers a <c>TouchExplorationStateChangeListener</c> for changes in
             the global touch exploration state of the system.</summary>
         <returns>True if successfully registered.</returns>
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml
index 4e0dfb42e4..56dbf00756 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityNodeInfo.xml
@@ -100,12 +100,12 @@
         <Parameter Name="info" Type="Android.Views.Accessibility.AccessibilityNodeInfo" />
       </Parameters>
       <Docs>
-        <param name="info">To be added.</param>
-        <summary>Creates a new <c>AccessibilityNodeInfo</c>.</summary>
+        <param name="info">The other info.</param>
+        <summary>Copy constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#AccessibilityNodeInfo()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.AccessibilityNodeInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#AccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.AccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo)</code>.</a>
             </format>
           </para>
           <para>
@@ -136,12 +136,12 @@
         <Parameter Name="source" Type="Android.Views.View" />
       </Parameters>
       <Docs>
-        <param name="source">To be added.</param>
-        <summary>Creates a new <c>AccessibilityNodeInfo</c>.</summary>
+        <param name="source">The source view.</param>
+        <summary>Creates a new <c>AccessibilityNodeInfo</c> with the given &lt;code&gt;source&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#AccessibilityNodeInfo()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.AccessibilityNodeInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#AccessibilityNodeInfo(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.AccessibilityNodeInfo(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -173,13 +173,13 @@
         <Parameter Name="virtualDescendantId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="root">To be added.</param>
-        <param name="virtualDescendantId">To be added.</param>
-        <summary>Creates a new <c>AccessibilityNodeInfo</c>.</summary>
+        <param name="root">The root of the virtual subtree.</param>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
+        <summary>Creates a new <c>AccessibilityNodeInfo</c> with the given &lt;code&gt;source&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#AccessibilityNodeInfo()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.AccessibilityNodeInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#AccessibilityNodeInfo(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.AccessibilityNodeInfo(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1929,9 +1929,18 @@
       </Parameters>
       <Docs>
         <param name="child">The child.</param>
-        <summary tool="true">Adds a child.</summary>
+        <summary>Adds a child.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#addChild(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.addChild(android.view.View)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 14" />
         <exception cref="T:Java.Lang.IllegalStateException">If called from an AccessibilityService.
@@ -1963,11 +1972,19 @@
       </Parameters>
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
-        <param name="virtualDescendantId">The id of the virtual child.
-</param>
-        <summary>Adds a virtual child which is a descendant of the given <c>root</c>.</summary>
+        <param name="virtualDescendantId">The id of the virtual child.</param>
+        <summary>Adds a virtual child which is a descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#addChild(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.addChild(android.view.View, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 16" />
       </Docs>
@@ -3592,13 +3609,12 @@
         <Parameter Name="outBounds" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="outBounds">The output node bounds.
-</param>
-        <summary>Returns the actual rect containing the node bounds in screen coordinates.</summary>
+        <param name="outBounds">The output node bounds.</param>
+        <summary>Gets the node bounds in screen coordinates.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#getBoundsInScreen()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.getBoundsInScreen()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#getBoundsInScreen(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.getBoundsInScreen(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -4740,12 +4756,13 @@
       </Parameters>
       <Docs>
         <param name="info">The other info.</param>
-        <summary>Returns a cached instance if such is available otherwise a new one.</summary>
+        <summary>Returns a cached instance if such is available or a new one is
+            create.</summary>
         <returns>An instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#obtain()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#obtain(android.view.accessibility.AccessibilityNodeInfo)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.obtain(android.view.accessibility.AccessibilityNodeInfo)</code>.</a>
             </format>
           </para>
           <para>
@@ -4781,12 +4798,13 @@
       </Parameters>
       <Docs>
         <param name="source">The source view.</param>
-        <summary>Returns a cached instance if such is available otherwise a new one.</summary>
+        <summary>Returns a cached instance if such is available otherwise a new one
+            and sets the source.</summary>
         <returns>An instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#obtain()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#obtain(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.obtain(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -4825,12 +4843,13 @@
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual descendant.</param>
-        <summary>Returns a cached instance if such is available otherwise a new one.</summary>
+        <summary>Returns a cached instance if such is available otherwise a new one
+            and sets the source.</summary>
         <returns>An instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#obtain()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#obtain(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.obtain(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5173,14 +5192,14 @@
         <Parameter Name="arguments" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="arguments">A bundle with additional arguments.</param>
         <param name="action">The action to perform.</param>
+        <param name="arguments">A bundle with additional arguments.</param>
         <summary>Performs an action on the node.</summary>
         <returns>True if the action was performed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#performAction(int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.performAction(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#performAction(int,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.performAction(int, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -5435,10 +5454,19 @@
       </Parameters>
       <Docs>
         <param name="child">The child.</param>
-        <summary tool="true">Removes a child.</summary>
-        <returns>To be added.</returns>
+        <summary>Removes a child.</summary>
+        <returns>true if the child was present</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#removeChild(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.removeChild(android.view.View)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <exception cref="T:Java.Lang.IllegalStateException">If called from an AccessibilityService.
 </exception>
@@ -5471,10 +5499,19 @@
         <param name="root">The root of the virtual subtree.</param>
         <param name="virtualDescendantId">The id of the virtual child.</param>
         <summary>Removes a virtual child which is a descendant of the given
- <c>root</c>.</summary>
-        <returns>To be added.</returns>
+            &lt;code&gt;root&lt;/code&gt;.</summary>
+        <returns>true if the child was present</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#removeChild(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.removeChild(android.view.View, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <altmember cref="M:Android.Views.Accessibility.AccessibilityNodeInfo.AddChild(Android.Views.View, System.Int32)" />
       </Docs>
@@ -5924,15 +5961,13 @@
       </Parameters>
       <Docs>
         <param name="root">The root whose virtual descendant labels this node's source.</param>
-        <param name="virtualDescendantId">The id of the virtual descendant.
-</param>
-        <param name="label">The view that labels this node's source.</param>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
         <summary>Sets the view which serves as the label of the view represented by
             this info for accessibility purposes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setLabeledBy(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setLabeledBy(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setLabeledBy(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setLabeledBy(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6010,15 +6045,13 @@
       </Parameters>
       <Docs>
         <param name="root">The root whose virtual descendant serves as a label.</param>
-        <param name="virtualDescendantId">The id of the virtual descendant.
-</param>
-        <param name="labeled">The view for which this info serves as a label.</param>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
         <summary>Sets the view for which the view represented by this info serves as a
             label for accessibility purposes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setLabelFor(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setLabelFor(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setLabelFor(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setLabelFor(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6097,14 +6130,12 @@
       </Parameters>
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
-        <param name="virtualDescendantId">The id of the virtual descendant.
-</param>
-        <param name="parent">The parent.</param>
-        <summary>Sets the parent.</summary>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
+        <summary>Sets the parent to be a virtual descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setParent(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setParent(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setParent(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setParent(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6220,14 +6251,12 @@
       </Parameters>
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
-        <param name="virtualDescendantId">The id of the virtual descendant.
-</param>
-        <param name="source">The info source.</param>
-        <summary>Sets the source.</summary>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
+        <summary>Sets the source to be a virtual descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setSource(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setSource(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setSource(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setSource(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6387,14 +6416,13 @@
         <Parameter Name="virtualDescendantId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="root">To be added.</param>
-        <param name="virtualDescendantId">To be added.</param>
-        <param name="view">The previous view.</param>
-        <summary>Sets the view whose node is visited after this one in accessibility traversal.</summary>
+        <param name="root">The root of the virtual subtree.</param>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
+        <summary>Sets the node after which this one is visited in accessibility traversal.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setTraversalAfter(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setTraversalAfter(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setTraversalAfter(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setTraversalAfter(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6468,14 +6496,13 @@
         <Parameter Name="virtualDescendantId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="root">To be added.</param>
-        <param name="virtualDescendantId">To be added.</param>
-        <param name="view">The view providing the preceding node.</param>
-        <summary>Sets the view before whose node this one should be visited during traversal.</summary>
+        <param name="root">The root of the virtual subtree.</param>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
+        <summary>Sets the node before which this one is visited during traversal.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setTraversalBefore(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setTraversalBefore(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#setTraversalBefore(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityNodeInfo.setTraversalBefore(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml
index 854a1db20a..7232c7e9e8 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityRecord.xml
@@ -87,12 +87,12 @@
         <Parameter Name="record" Type="Android.Views.Accessibility.AccessibilityRecord" />
       </Parameters>
       <Docs>
-        <param name="record">To be added.</param>
-        <summary>Creates a new <c>AccessibilityRecord</c>.</summary>
+        <param name="record">The other record.</param>
+        <summary>Copy constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord#AccessibilityRecord()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityRecord.AccessibilityRecord()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord#AccessibilityRecord(android.view.accessibility.AccessibilityRecord)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityRecord.AccessibilityRecord(android.view.accessibility.AccessibilityRecord)</code>.</a>
             </format>
           </para>
           <para>
@@ -1003,7 +1003,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord#obtain()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityRecord.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord#obtain(android.view.accessibility.AccessibilityRecord)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityRecord.obtain(android.view.accessibility.AccessibilityRecord)</code>.</a>
             </format>
           </para>
           <para>
@@ -1563,14 +1563,12 @@
       </Parameters>
       <Docs>
         <param name="root">The root of the virtual subtree.</param>
-        <param name="virtualDescendantId">The id of the virtual descendant.
-</param>
-        <param name="source">The source.</param>
-        <summary>Sets the event source.</summary>
+        <param name="virtualDescendantId">The id of the virtual descendant.</param>
+        <summary>Sets the source to be a virtual descendant of the given &lt;code&gt;root&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord#setSource(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityRecord.setSource(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord#setSource(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityRecord.setSource(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo.xml b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo.xml
index c37568350c..cbe9dcca25 100644
--- a/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.Accessibility/AccessibilityWindowInfo.xml
@@ -99,12 +99,12 @@
         <Parameter Name="info" Type="Android.Views.Accessibility.AccessibilityWindowInfo" />
       </Parameters>
       <Docs>
-        <param name="info">To be added.</param>
-        <summary>Creates a new <c>AccessibilityWindowInfo</c>.</summary>
+        <param name="info">The other info.</param>
+        <summary>Copy constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo#AccessibilityWindowInfo()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityWindowInfo.AccessibilityWindowInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo#AccessibilityWindowInfo(android.view.accessibility.AccessibilityWindowInfo)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityWindowInfo.AccessibilityWindowInfo(android.view.accessibility.AccessibilityWindowInfo)</code>.</a>
             </format>
           </para>
           <para>
@@ -721,7 +721,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo#obtain()" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityWindowInfo.obtain()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo#obtain(android.view.accessibility.AccessibilityWindowInfo)" title="Reference documentation">Java documentation for <code>android.view.accessibility.AccessibilityWindowInfo.obtain(android.view.accessibility.AccessibilityWindowInfo)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/AccelerateInterpolator.xml b/docs/Mono.Android/en/Android.Views.Animations/AccelerateInterpolator.xml
index 864905cbbc..7f17b74f7e 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/AccelerateInterpolator.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/AccelerateInterpolator.xml
@@ -68,10 +68,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="factor">Degree to which the animation should be eased. Seting
-                   factor to 1.0f produces a y=x^2 parabola. Increasing factor above
-                   1.0f  exaggerates the ease-in effect (i.e., it starts even
-                   slower and ends evens faster)</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
@@ -151,10 +147,6 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
-        <param name="factor">Degree to which the animation should be eased. Seting
-                   factor to 1.0f produces a y=x^2 parabola. Increasing factor above
-                   1.0f  exaggerates the ease-in effect (i.e., it starts even
-                   slower and ends evens faster)</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/AlphaAnimation.xml b/docs/Mono.Android/en/Android.Views.Animations/AlphaAnimation.xml
index 4bb1db2847..85a3199f63 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/AlphaAnimation.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/AlphaAnimation.xml
@@ -55,16 +55,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <param name="fromAlpha">Starting alpha value for the animation, where 1.0 means
-                   fully opaque and 0.0 means fully transparent.</param>
-        <param name="toAlpha">Ending alpha value for the animation.</param>
-        <summary>Constructor to use when building an AlphaAnimation from code</summary>
+        <param name="context">Application context to use</param>
+        <param name="attrs">Attribute set from which to read values</param>
+        <summary>Constructor used when an AlphaAnimation is loaded from a resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/AlphaAnimation#AlphaAnimation(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.AlphaAnimation.AlphaAnimation(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/AlphaAnimation#AlphaAnimation(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.AlphaAnimation.AlphaAnimation(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/Animation.xml b/docs/Mono.Android/en/Android.Views.Animations/Animation.xml
index 90a46aa717..8ae8f05caf 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/Animation.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/Animation.xml
@@ -103,14 +103,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <summary>Creates a new animation with a duration of 0ms, the default interpolator, with
-            fillBefore set to true and fillAfter set to false</summary>
+        <param name="context">the application environment</param>
+        <param name="attrs">the set of attributes holding the animation parameters</param>
+        <summary>Creates a new animation whose parameters come from the specified context and
+            attributes set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/Animation#Animation()" title="Reference documentation">Java documentation for <code>android.view.animation.Animation.Animation()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/Animation#Animation(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.Animation.Animation(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -744,17 +744,17 @@
         <Parameter Name="scale" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="scale">Scaling factor to apply to any inputs to the transform operation, such
-        pivot points being rotated or scaled around.</param>
         <param name="currentTime">Where we are in the animation. This is wall clock time.</param>
         <param name="outTransformation">A transformation object that is provided by the
                    caller and will be filled in by the animation.</param>
+        <param name="scale">Scaling factor to apply to any inputs to the transform operation, such
+                   pivot points being rotated or scaled around.</param>
         <summary>Gets the transformation to apply at a specified point in time.</summary>
         <returns>True if the animation is still running</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/Animation#getTransformation(long,%20android.view.animation.Transformation)" title="Reference documentation">Java documentation for <code>android.view.animation.Animation.getTransformation(long, android.view.animation.Transformation)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/Animation#getTransformation(long,%20android.view.animation.Transformation,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.Animation.getTransformation(long, android.view.animation.Transformation, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -948,8 +948,7 @@
         <ReturnType>Android.Views.Animations.IInterpolator</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="context">The application environment</param>
-        <param name="resID">The resource identifier of the interpolator to load</param>
+        <param name="i">The interpolator which defines the acceleration curve</param>
         <summary>Gets the acceleration curve type for this animation. -or- Sets the acceleration curve for this animation.</summary>
         <value>the <c>Interpolator</c> associated to this animation</value>
         <remarks>
@@ -962,7 +961,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/Animation#setInterpolator(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.view.animation.Animation.setInterpolator(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/Animation#setInterpolator(android.view.animation.Interpolator)" title="Reference documentation">Java documentation for <code>android.view.animation.Animation.setInterpolator(android.view.animation.Interpolator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/AnimationSet.xml b/docs/Mono.Android/en/Android.Views.Animations/AnimationSet.xml
index da2e69389b..c33e201163 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/AnimationSet.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/AnimationSet.xml
@@ -54,14 +54,14 @@
         <Parameter Name="shareInterpolator" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="shareInterpolator">To be added.</param>
-        <param name="context">Application context to use</param>
-        <param name="attrs">Attribute set from which to read values</param>
-        <summary>Constructor used when an AnimationSet is loaded from a resource.</summary>
+        <param name="shareInterpolator">Pass true if all of the animations in this set
+                   should use the interpolator associated with this AnimationSet.
+                   Pass false if each animation should use its own interpolator.</param>
+        <summary>Constructor to use when building an AnimationSet from code</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/AnimationSet#AnimationSet(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.AnimationSet.AnimationSet(android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/AnimationSet#AnimationSet(boolean)" title="Reference documentation">Java documentation for <code>android.view.animation.AnimationSet.AnimationSet(boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/AnticipateInterpolator.xml b/docs/Mono.Android/en/Android.Views.Animations/AnticipateInterpolator.xml
index f47104215d..5e50c3af5a 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/AnticipateInterpolator.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/AnticipateInterpolator.xml
@@ -67,9 +67,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="tension">Amount of anticipation. When tension equals 0.0f, there is
-                           no anticipation and the interpolator becomes a simple
-                           acceleration interpolator.</param>
         <summary>
         </summary>
         <remarks>
@@ -150,9 +147,6 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
-        <param name="tension">Amount of anticipation. When tension equals 0.0f, there is
-                           no anticipation and the interpolator becomes a simple
-                           acceleration interpolator.</param>
         <summary>
         </summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/AnticipateOvershootInterpolator.xml b/docs/Mono.Android/en/Android.Views.Animations/AnticipateOvershootInterpolator.xml
index 981ef33796..0e43b32b93 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/AnticipateOvershootInterpolator.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/AnticipateOvershootInterpolator.xml
@@ -68,9 +68,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="tension">Amount of anticipation/overshoot. When tension equals 0.0f,
-                           there is no anticipation/overshoot and the interpolator becomes
-                           a simple acceleration/deceleration interpolator.</param>
         <summary>
         </summary>
         <remarks>
@@ -151,9 +148,6 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
-        <param name="tension">Amount of anticipation/overshoot. When tension equals 0.0f,
-                           there is no anticipation/overshoot and the interpolator becomes
-                           a simple acceleration/deceleration interpolator.</param>
         <summary>
         </summary>
         <remarks>
@@ -215,16 +209,18 @@
         <Parameter Name="extraTension" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="extraTension">To be added.</param>
         <param name="tension">Amount of anticipation/overshoot. When tension equals 0.0f,
                            there is no anticipation/overshoot and the interpolator becomes
                            a simple acceleration/deceleration interpolator.</param>
+        <param name="extraTension">Amount by which to multiply the tension. For instance,
+                                to get the same overshoot as an OvershootInterpolator with
+                                a tension of 2.0f, you would use an extraTension of 1.5f.</param>
         <summary>
         </summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/AnticipateOvershootInterpolator#AnticipateOvershootInterpolator(float)" title="Reference documentation">Java documentation for <code>android.view.animation.AnticipateOvershootInterpolator.AnticipateOvershootInterpolator(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/AnticipateOvershootInterpolator#AnticipateOvershootInterpolator(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.AnticipateOvershootInterpolator.AnticipateOvershootInterpolator(float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/DecelerateInterpolator.xml b/docs/Mono.Android/en/Android.Views.Animations/DecelerateInterpolator.xml
index 7703adf043..fcf65c42aa 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/DecelerateInterpolator.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/DecelerateInterpolator.xml
@@ -68,9 +68,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="factor">Degree to which the animation should be eased. Setting factor to 1.0f produces
-                   an upside-down y=x^2 parabola. Increasing factor above 1.0f exaggerates the
-                   ease-out effect (i.e., it starts even faster and ends evens slower).</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
@@ -149,9 +146,6 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
-        <param name="factor">Degree to which the animation should be eased. Setting factor to 1.0f produces
-                   an upside-down y=x^2 parabola. Increasing factor above 1.0f exaggerates the
-                   ease-out effect (i.e., it starts even faster and ends evens slower).</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/GridLayoutAnimationController.xml b/docs/Mono.Android/en/Android.Views.Animations/GridLayoutAnimationController.xml
index 9e9954bf46..73826c4082 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/GridLayoutAnimationController.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/GridLayoutAnimationController.xml
@@ -54,16 +54,13 @@
         <Parameter Name="animation" Type="Android.Views.Animations.Animation" />
       </Parameters>
       <Docs>
-        <param name="animation">To be added.</param>
-        <param name="context">the Context the view  group is running in, through which
-                   it can access the resources</param>
-        <param name="attrs">the attributes of the XML tag that is inflating the
-                   layout animation controller</param>
-        <summary>Creates a new grid layout animation controller from external resources.</summary>
+        <param name="animation">the animation to use on each child of the view group</param>
+        <summary>Creates a new layout animation controller with a delay of 50%
+            for both rows and columns and the specified animation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController#GridLayoutAnimationController(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.GridLayoutAnimationController.GridLayoutAnimationController(android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController#GridLayoutAnimationController(android.view.animation.Animation)" title="Reference documentation">Java documentation for <code>android.view.animation.GridLayoutAnimationController.GridLayoutAnimationController(android.view.animation.Animation)</code>.</a>
             </format>
           </para>
           <para>
@@ -161,18 +158,15 @@
         <Parameter Name="rowDelay" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="animation">To be added.</param>
-        <param name="columnDelay">To be added.</param>
-        <param name="rowDelay">To be added.</param>
-        <param name="context">the Context the view  group is running in, through which
-                   it can access the resources</param>
-        <param name="attrs">the attributes of the XML tag that is inflating the
-                   layout animation controller</param>
-        <summary>Creates a new grid layout animation controller from external resources.</summary>
+        <param name="animation">the animation to use on each child of the view group</param>
+        <param name="columnDelay">the delay by which each column animation must be offset</param>
+        <param name="rowDelay">the delay by which each row animation must be offset</param>
+        <summary>Creates a new layout animation controller with the specified delays
+            and the specified animation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController#GridLayoutAnimationController(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.GridLayoutAnimationController.GridLayoutAnimationController(android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController#GridLayoutAnimationController(android.view.animation.Animation,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.GridLayoutAnimationController.GridLayoutAnimationController(android.view.animation.Animation, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/LayoutAnimationController.xml b/docs/Mono.Android/en/Android.Views.Animations/LayoutAnimationController.xml
index 195fc261f0..6aacab6864 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/LayoutAnimationController.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/LayoutAnimationController.xml
@@ -55,16 +55,13 @@
         <Parameter Name="animation" Type="Android.Views.Animations.Animation" />
       </Parameters>
       <Docs>
-        <param name="animation">To be added.</param>
-        <param name="context">the Context the view  group is running in, through which
-                   it can access the resources</param>
-        <param name="attrs">the attributes of the XML tag that is inflating the
-                   layout animation controller</param>
-        <summary>Creates a new layout animation controller from external resources.</summary>
+        <param name="animation">the animation to use on each child of the view group</param>
+        <summary>Creates a new layout animation controller with a delay of 50%
+            and the specified animation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#LayoutAnimationController(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.LayoutAnimationController(android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#LayoutAnimationController(android.view.animation.Animation)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.LayoutAnimationController(android.view.animation.Animation)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,17 +135,14 @@
         <Parameter Name="delay" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="animation">To be added.</param>
-        <param name="delay">To be added.</param>
-        <param name="context">the Context the view  group is running in, through which
-                   it can access the resources</param>
-        <param name="attrs">the attributes of the XML tag that is inflating the
-                   layout animation controller</param>
-        <summary>Creates a new layout animation controller from external resources.</summary>
+        <param name="animation">the animation to use on each child of the view group</param>
+        <param name="delay">the delay by which each child's animation must be offset</param>
+        <summary>Creates a new layout animation controller with the specified delay
+            and the specified animation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#LayoutAnimationController(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.LayoutAnimationController(android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#LayoutAnimationController(android.view.animation.Animation,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.LayoutAnimationController(android.view.animation.Animation, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -207,8 +201,7 @@
         <ReturnType>Android.Views.Animations.Animation</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="context">the context from which the animation must be inflated</param>
-        <param name="resourceID">the resource identifier of the animation</param>
+        <param name="animation">the animation to run on each child of the view group</param>
         <summary>Returns the animation applied to each child of the view group on which
             this controller is set. -or- Sets the animation to be run on each child of the view group on which
             this layout animation controller is .</summary>
@@ -223,7 +216,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#setAnimation(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.setAnimation(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#setAnimation(android.view.animation.Animation)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.setAnimation(android.view.animation.Animation)</code>.</a>
             </format>
           </para>
           <para>
@@ -448,8 +441,7 @@
         <ReturnType>Android.Views.Animations.IInterpolator</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="context">the context from which the interpolator must be inflated</param>
-        <param name="resourceID">the resource identifier of the interpolator</param>
+        <param name="interpolator">the interpolator</param>
         <summary>Returns the interpolator used to interpolate the delays between the
             children. -or- Sets the interpolator used to interpolate the delays between the
             children.</summary>
@@ -464,7 +456,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#setInterpolator(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.setInterpolator(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController#setInterpolator(android.view.animation.Interpolator)" title="Reference documentation">Java documentation for <code>android.view.animation.LayoutAnimationController.setInterpolator(android.view.animation.Interpolator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/OvershootInterpolator.xml b/docs/Mono.Android/en/Android.Views.Animations/OvershootInterpolator.xml
index c12a88216d..a59084580d 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/OvershootInterpolator.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/OvershootInterpolator.xml
@@ -68,9 +68,6 @@
       </Attributes>
       <Parameters />
       <Docs>
-        <param name="tension">Amount of overshoot. When tension equals 0.0f, there is
-                           no overshoot and the interpolator becomes a simple
-                           deceleration interpolator.</param>
         <summary>
         </summary>
         <remarks>
@@ -151,9 +148,6 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
-        <param name="tension">Amount of overshoot. When tension equals 0.0f, there is
-                           no overshoot and the interpolator becomes a simple
-                           deceleration interpolator.</param>
         <summary>
         </summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml b/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml
index 95618806a2..f8607fa6f2 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/PathInterpolator.xml
@@ -70,14 +70,12 @@
         <Parameter Name="path" Type="Android.Graphics.Path" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="controlX">The x coordinate of the quadratic Bezier control point.</param>
-        <param name="controlY">The y coordinate of the quadratic Bezier control point.</param>
-        <summary>Create an interpolator for a quadratic Bezier curve.</summary>
+        <param name="path">The &lt;code&gt;Path&lt;/code&gt; to use to make the line representing the interpolator.</param>
+        <summary>Create an interpolator for an arbitrary &lt;code&gt;Path&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/PathInterpolator#PathInterpolator(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.PathInterpolator.PathInterpolator(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/PathInterpolator#PathInterpolator(android.graphics.Path)" title="Reference documentation">Java documentation for <code>android.view.animation.PathInterpolator.PathInterpolator(android.graphics.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -111,8 +109,6 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
-        <param name="controlX">The x coordinate of the quadratic Bezier control point.</param>
-        <param name="controlY">The y coordinate of the quadratic Bezier control point.</param>
         <summary>Create an interpolator for a quadratic Bezier curve.</summary>
         <remarks>
           <para>
@@ -212,17 +208,15 @@
         <Parameter Name="controlY2" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="controlX1">To be added.</param>
-        <param name="controlY1">To be added.</param>
-        <param name="controlX2">To be added.</param>
-        <param name="controlY2">To be added.</param>
-        <param name="controlX">The x coordinate of the quadratic Bezier control point.</param>
-        <param name="controlY">The y coordinate of the quadratic Bezier control point.</param>
-        <summary>Create an interpolator for a quadratic Bezier curve.</summary>
+        <param name="controlX1">The x coordinate of the first control point of the cubic Bezier.</param>
+        <param name="controlY1">The y coordinate of the first control point of the cubic Bezier.</param>
+        <param name="controlX2">The x coordinate of the second control point of the cubic Bezier.</param>
+        <param name="controlY2">The y coordinate of the second control point of the cubic Bezier.</param>
+        <summary>Create an interpolator for a cubic Bezier curve.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/PathInterpolator#PathInterpolator(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.PathInterpolator.PathInterpolator(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/PathInterpolator#PathInterpolator(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.PathInterpolator.PathInterpolator(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/RotateAnimation.xml b/docs/Mono.Android/en/Android.Views.Animations/RotateAnimation.xml
index 82fe1cc33b..4d033550d2 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/RotateAnimation.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/RotateAnimation.xml
@@ -55,16 +55,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <param name="fromDegrees">Rotation offset to apply at the start of the
-                   animation.</param>
-        <param name="toDegrees">Rotation offset to apply at the end of the animation.</param>
-        <summary>Constructor to use when building a RotateAnimation from code.</summary>
+        <param name="context">Application context to use</param>
+        <param name="attrs">Attribute set from which to read values</param>
+        <summary>Constructor used when a RotateAnimation is loaded from a resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/RotateAnimation#RotateAnimation(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.RotateAnimation.RotateAnimation(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/RotateAnimation#RotateAnimation(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.RotateAnimation.RotateAnimation(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -162,16 +159,20 @@
         <Parameter Name="pivotY" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="pivotX">To be added.</param>
-        <param name="pivotY">To be added.</param>
         <param name="fromDegrees">Rotation offset to apply at the start of the
                    animation.</param>
         <param name="toDegrees">Rotation offset to apply at the end of the animation.</param>
-        <summary>Constructor to use when building a RotateAnimation from code.</summary>
+        <param name="pivotX">The X coordinate of the point about which the object is
+                   being rotated, specified as an absolute number where 0 is the left
+                   edge.</param>
+        <param name="pivotY">The Y coordinate of the point about which the object is
+                   being rotated, specified as an absolute number where 0 is the top
+                   edge.</param>
+        <summary>Constructor to use when building a RotateAnimation from code</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/RotateAnimation#RotateAnimation(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.RotateAnimation.RotateAnimation(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/RotateAnimation#RotateAnimation(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.RotateAnimation.RotateAnimation(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -222,18 +223,30 @@
         <Parameter Name="pivotYValue" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="pivotXType">To be added.</param>
-        <param name="pivotXValue">To be added.</param>
-        <param name="pivotYType">To be added.</param>
-        <param name="pivotYValue">To be added.</param>
         <param name="fromDegrees">Rotation offset to apply at the start of the
                    animation.</param>
         <param name="toDegrees">Rotation offset to apply at the end of the animation.</param>
-        <summary>Constructor to use when building a RotateAnimation from code.</summary>
+        <param name="pivotXType">Specifies how pivotXValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="pivotXValue">The X coordinate of the point about which the object
+                   is being rotated, specified as an absolute number where 0 is the
+                   left edge. This value can either be an absolute number if
+                   pivotXType is ABSOLUTE, or a percentage (where 1.0 is 100%)
+                   otherwise.</param>
+        <param name="pivotYType">Specifies how pivotYValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="pivotYValue">The Y coordinate of the point about which the object
+                   is being rotated, specified as an absolute number where 0 is the
+                   top edge. This value can either be an absolute number if
+                   pivotYType is ABSOLUTE, or a percentage (where 1.0 is 100%)
+                   otherwise.</param>
+        <summary>Constructor to use when building a RotateAnimation from code</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/RotateAnimation#RotateAnimation(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.RotateAnimation.RotateAnimation(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/RotateAnimation#RotateAnimation(float,%20float,%20int,%20float,%20int,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.RotateAnimation.RotateAnimation(float, float, int, float, int, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/ScaleAnimation.xml b/docs/Mono.Android/en/Android.Views.Animations/ScaleAnimation.xml
index 82a0ccf6f3..5a47ed50ea 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/ScaleAnimation.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/ScaleAnimation.xml
@@ -55,19 +55,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <param name="fromX">Horizontal scaling factor to apply at the start of the
-                   animation</param>
-        <param name="toX">Horizontal scaling factor to apply at the end of the animation</param>
-        <param name="fromY">Vertical scaling factor to apply at the start of the
-                   animation</param>
-        <param name="toY">Vertical scaling factor to apply at the end of the animation</param>
-        <summary>Constructor to use when building a ScaleAnimation from code</summary>
+        <param name="context">Application context to use</param>
+        <param name="attrs">Attribute set from which to read values</param>
+        <summary>Constructor used when a ScaleAnimation is loaded from a resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/ScaleAnimation#ScaleAnimation(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.ScaleAnimation.ScaleAnimation(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/ScaleAnimation#ScaleAnimation(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.ScaleAnimation.ScaleAnimation(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -172,19 +166,23 @@
         <Parameter Name="pivotY" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="pivotX">To be added.</param>
-        <param name="pivotY">To be added.</param>
         <param name="fromX">Horizontal scaling factor to apply at the start of the
                    animation</param>
         <param name="toX">Horizontal scaling factor to apply at the end of the animation</param>
         <param name="fromY">Vertical scaling factor to apply at the start of the
                    animation</param>
         <param name="toY">Vertical scaling factor to apply at the end of the animation</param>
+        <param name="pivotX">The X coordinate of the point about which the object is
+                   being scaled, specified as an absolute number where 0 is the left
+                   edge. (This point remains fixed while the object changes size.)</param>
+        <param name="pivotY">The Y coordinate of the point about which the object is
+                   being scaled, specified as an absolute number where 0 is the top
+                   edge. (This point remains fixed while the object changes size.)</param>
         <summary>Constructor to use when building a ScaleAnimation from code</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/ScaleAnimation#ScaleAnimation(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.ScaleAnimation.ScaleAnimation(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/ScaleAnimation#ScaleAnimation(float,%20float,%20float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.ScaleAnimation.ScaleAnimation(float, float, float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -237,21 +235,33 @@
         <Parameter Name="pivotYValue" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="pivotXType">To be added.</param>
-        <param name="pivotXValue">To be added.</param>
-        <param name="pivotYType">To be added.</param>
-        <param name="pivotYValue">To be added.</param>
         <param name="fromX">Horizontal scaling factor to apply at the start of the
                    animation</param>
         <param name="toX">Horizontal scaling factor to apply at the end of the animation</param>
         <param name="fromY">Vertical scaling factor to apply at the start of the
                    animation</param>
         <param name="toY">Vertical scaling factor to apply at the end of the animation</param>
+        <param name="pivotXType">Specifies how pivotXValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="pivotXValue">The X coordinate of the point about which the object
+                   is being scaled, specified as an absolute number where 0 is the
+                   left edge. (This point remains fixed while the object changes
+                   size.) This value can either be an absolute number if pivotXType
+                   is ABSOLUTE, or a percentage (where 1.0 is 100%) otherwise.</param>
+        <param name="pivotYType">Specifies how pivotYValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="pivotYValue">The Y coordinate of the point about which the object
+                   is being scaled, specified as an absolute number where 0 is the
+                   top edge. (This point remains fixed while the object changes
+                   size.) This value can either be an absolute number if pivotYType
+                   is ABSOLUTE, or a percentage (where 1.0 is 100%) otherwise.</param>
         <summary>Constructor to use when building a ScaleAnimation from code</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/ScaleAnimation#ScaleAnimation(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.ScaleAnimation.ScaleAnimation(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/ScaleAnimation#ScaleAnimation(float,%20float,%20float,%20float,%20int,%20float,%20int,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.ScaleAnimation.ScaleAnimation(float, float, float, float, int, float, int, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Animations/TranslateAnimation.xml b/docs/Mono.Android/en/Android.Views.Animations/TranslateAnimation.xml
index 161e3edd74..ef16832004 100644
--- a/docs/Mono.Android/en/Android.Views.Animations/TranslateAnimation.xml
+++ b/docs/Mono.Android/en/Android.Views.Animations/TranslateAnimation.xml
@@ -55,21 +55,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <param name="fromXDelta">Change in X coordinate to apply at the start of the
-                   animation</param>
-        <param name="toXDelta">Change in X coordinate to apply at the end of the
-                   animation</param>
-        <param name="fromYDelta">Change in Y coordinate to apply at the start of the
-                   animation</param>
-        <param name="toYDelta">Change in Y coordinate to apply at the end of the
-                   animation</param>
-        <summary>Constructor to use when building a TranslateAnimation from code</summary>
+        <param name="context">Application context to use</param>
+        <param name="attrs">Attribute set from which to read values</param>
+        <summary>Constructor used when a TranslateAnimation is loaded from a resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/TranslateAnimation#TranslateAnimation(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.TranslateAnimation.TranslateAnimation(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/TranslateAnimation#TranslateAnimation(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.animation.TranslateAnimation.TranslateAnimation(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -206,27 +198,35 @@
         <Parameter Name="toYValue" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="fromXType">To be added.</param>
-        <param name="fromXValue">To be added.</param>
-        <param name="toXType">To be added.</param>
-        <param name="toXValue">To be added.</param>
-        <param name="fromYType">To be added.</param>
-        <param name="fromYValue">To be added.</param>
-        <param name="toYType">To be added.</param>
-        <param name="toYValue">To be added.</param>
-        <param name="fromXDelta">Change in X coordinate to apply at the start of the
-                   animation</param>
-        <param name="toXDelta">Change in X coordinate to apply at the end of the
-                   animation</param>
-        <param name="fromYDelta">Change in Y coordinate to apply at the start of the
-                   animation</param>
-        <param name="toYDelta">Change in Y coordinate to apply at the end of the
-                   animation</param>
+        <param name="fromXType">Specifies how fromXValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="fromXValue">Change in X coordinate to apply at the start of the
+                   animation. This value can either be an absolute number if fromXType
+                   is ABSOLUTE, or a percentage (where 1.0 is 100%) otherwise.</param>
+        <param name="toXType">Specifies how toXValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="toXValue">Change in X coordinate to apply at the end of the
+                   animation. This value can either be an absolute number if toXType
+                   is ABSOLUTE, or a percentage (where 1.0 is 100%) otherwise.</param>
+        <param name="fromYType">Specifies how fromYValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="fromYValue">Change in Y coordinate to apply at the start of the
+                   animation. This value can either be an absolute number if fromYType
+                   is ABSOLUTE, or a percentage (where 1.0 is 100%) otherwise.</param>
+        <param name="toYType">Specifies how toYValue should be interpreted. One of
+                   Animation.ABSOLUTE, Animation.RELATIVE_TO_SELF, or
+                   Animation.RELATIVE_TO_PARENT.</param>
+        <param name="toYValue">Change in Y coordinate to apply at the end of the
+                   animation. This value can either be an absolute number if toYType
+                   is ABSOLUTE, or a percentage (where 1.0 is 100%) otherwise.</param>
         <summary>Constructor to use when building a TranslateAnimation from code</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/animation/TranslateAnimation#TranslateAnimation(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.TranslateAnimation.TranslateAnimation(float, float, float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/animation/TranslateAnimation#TranslateAnimation(int,%20float,%20int,%20float,%20int,%20float,%20int,%20float)" title="Reference documentation">Java documentation for <code>android.view.animation.TranslateAnimation.TranslateAnimation(int, float, int, float, int, float, int, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Autofill/AutofillManager.xml b/docs/Mono.Android/en/Android.Views.Autofill/AutofillManager.xml
index d9fe66f2b4..96db9ebcba 100644
--- a/docs/Mono.Android/en/Android.Views.Autofill/AutofillManager.xml
+++ b/docs/Mono.Android/en/Android.Views.Autofill/AutofillManager.xml
@@ -710,14 +710,14 @@
         <Parameter Name="value" Type="Android.Views.Autofill.AutofillValue" />
       </Parameters>
       <Docs>
-        <param name="virtualId">To be added.</param>
-        <param name="value">To be added.</param>
-        <param name="view">view whose value changed.</param>
-        <summary>Called to indicate the value of an autofillable <c>View</c> changed.</summary>
+        <param name="view">the virtual view parent.</param>
+        <param name="virtualId">id identifying the virtual child inside the parent view.</param>
+        <param name="value">new value of the child.</param>
+        <summary>Called to indicate the value of an autofillable virtual view has changed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyValueChanged(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyValueChanged(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyValueChanged(android.view.View,%20int,%20android.view.autofill.AutofillValue)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyValueChanged(android.view.View, int, android.view.autofill.AutofillValue)</code>.</a>
             </format>
           </para>
           <para>
@@ -791,13 +791,13 @@
         <Parameter Name="virtualId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="virtualId">To be added.</param>
-        <param name="view">view that has been clicked.</param>
-        <summary>Called to indicate a <c>View</c> is clicked.</summary>
+        <param name="view">the virtual view parent.</param>
+        <param name="virtualId">id identifying the virtual child inside the parent view.</param>
+        <summary>Called to indicate a virtual view has been clicked.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewClicked(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewClicked(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewClicked(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewClicked(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -873,15 +873,14 @@
         <Parameter Name="absBounds" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="virtualId">To be added.</param>
-        <param name="absBounds">To be added.</param>
-        <param name="view">
-          <c>View</c> that was entered.</param>
-        <summary>Called when a <c>View</c> that supports autofill is entered.</summary>
+        <param name="view">the virtual view parent.</param>
+        <param name="virtualId">id identifying the virtual child inside the parent view.</param>
+        <param name="absBounds">absolute boundaries of the virtual view in the screen.</param>
+        <summary>Called when a virtual view that supports autofill is entered.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewEntered(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewEntered(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewEntered(android.view.View,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewEntered(android.view.View, int, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -956,14 +955,13 @@
         <Parameter Name="virtualId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="virtualId">To be added.</param>
-        <param name="view">
-          <c>View</c> that was exited.</param>
-        <summary>Called when a <c>View</c> that supports autofill is exited.</summary>
+        <param name="view">the virtual view parent.</param>
+        <param name="virtualId">id identifying the virtual child inside the parent view.</param>
+        <summary>Called when a virtual view that supports autofill is exited.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewExited(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewExited(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewExited(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewExited(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1000,13 +998,12 @@
       <Docs>
         <param name="view">
           <c>View</c> that was exited.</param>
-        <param name="virtualId">id identifying the virtual child inside the parent view.</param>
         <param name="isVisible">visible if the view is visible in the view hierarchy.</param>
-        <summary>Called when a virtual view's visibility changed.</summary>
+        <summary>Called when a <c>View view's</c> visibility changed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewVisibilityChanged(android.view.View,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewVisibilityChanged(android.view.View, int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#notifyViewVisibilityChanged(android.view.View,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.notifyViewVisibilityChanged(android.view.View, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1164,14 +1161,14 @@
         <Parameter Name="absBounds" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="virtualId">To be added.</param>
-        <param name="absBounds">To be added.</param>
-        <param name="view">view requesting the new autofill context.</param>
-        <summary>Explicitly requests a new autofill context.</summary>
+        <param name="view">the virtual view parent.</param>
+        <param name="virtualId">id identifying the virtual child inside the parent view.</param>
+        <param name="absBounds">absolute boundaries of the virtual view in the screen.</param>
+        <summary>Explicitly requests a new autofill context for virtual views.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#requestAutofill(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.requestAutofill(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/autofill/AutofillManager#requestAutofill(android.view.View,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.autofill.AutofillManager.requestAutofill(android.view.View, int, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo.xml b/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo.xml
index ddfc629341..9324f45469 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/CompletionInfo.xml
@@ -142,17 +142,18 @@
         <Parameter Name="label" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="label">To be added.</param>
         <param name="id">An id that get passed as is (to the editor's discretion)</param>
         <param name="index">An index that get passed as is. Typically this is the
             index in the list of completions inside the editor.</param>
         <param name="text">The text that should be inserted into the editor when
             this completion is chosen.</param>
-        <summary>Create a simple completion with just text, no label.</summary>
+        <param name="label">The text that the IME should be showing among the
+            completions list.</param>
+        <summary>Create a full completion with both text and label.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo#CompletionInfo(long,%20int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.CompletionInfo.CompletionInfo(long, int, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo#CompletionInfo(long,%20int,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.CompletionInfo.CompletionInfo(long, int, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/IInputMethodSession.xml b/docs/Mono.Android/en/Android.Views.InputMethods/IInputMethodSession.xml
index eda110693a..1d48ee8994 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/IInputMethodSession.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/IInputMethodSession.xml
@@ -114,7 +114,6 @@
         <param name="seq">To be added.</param>
         <param name="e">The motion event.</param>
         <param name="callback">To be added.</param>
-        <param name="event">The motion event.</param>
         <summary>This method is called when there is a generic motion event.</summary>
         <returns>Whether the input method wants to handle this event.</returns>
         <remarks>
@@ -161,7 +160,6 @@
         <param name="seq">To be added.</param>
         <param name="e">The key event.</param>
         <param name="callback">To be added.</param>
-        <param name="event">The key event.</param>
         <summary>This method is called when a key is pressed.</summary>
         <returns>Whether the input method wants to handle this event.</returns>
         <remarks>
@@ -208,7 +206,6 @@
         <param name="seq">To be added.</param>
         <param name="e">The motion event.</param>
         <param name="callback">To be added.</param>
-        <param name="event">The motion event.</param>
         <summary>This method is called when there is a track ball event.</summary>
         <returns>Whether the input method wants to handle this event.</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding.xml
index 73ee347878..f709bd06db 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputBinding.xml
@@ -69,16 +69,14 @@
         <Parameter Name="binding" Type="Android.Views.InputMethods.InputBinding" />
       </Parameters>
       <Docs>
-        <param name="binding">To be added.</param>
-        <param name="conn">The interface for communicating back with the application.</param>
-        <param name="connToken">A remoteable token for communicating across processes.</param>
-        <param name="uid">The user id of the client of this binding.</param>
-        <param name="pid">The process id of where the binding came from.</param>
-        <summary>Constructor.</summary>
+        <param name="conn">The new connection interface.</param>
+        <param name="binding">Existing binding to copy.</param>
+        <summary>Constructor from an existing InputBinding taking a new local input
+            connection interface.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inputmethod/InputBinding#InputBinding(android.view.inputmethod.InputConnection,%20android.os.IBinder,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputBinding.InputBinding(android.view.inputmethod.InputConnection, android.os.IBinder, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inputmethod/InputBinding#InputBinding(android.view.inputmethod.InputConnection,%20android.view.inputmethod.InputBinding)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputBinding.InputBinding(android.view.inputmethod.InputConnection, android.view.inputmethod.InputBinding)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo.xml
index 162784a396..3026bcb607 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputContentInfo.xml
@@ -110,18 +110,19 @@
         <Parameter Name="linkUri" Type="Android.Net.Uri" />
       </Parameters>
       <Docs>
-        <param name="linkUri">To be added.</param>
         <param name="contentUri">Content URI to be exported from the input method.
             This cannot be <c>null</c>.</param>
         <param name="description">A <c>ClipDescription</c> object that contains the metadata of
             <c>contentUri</c> such as MIME type(s). This object cannot be <c>null</c>. Also
             <c>ClipDescription#getLabel()</c> should be describing the content specified by
             <c>contentUri</c> for accessibility reasons.</param>
-        <summary>Constructs <c>InputContentInfo</c> object only with mandatory data.</summary>
+        <param name="linkUri">An optional <c>http</c> or <c>https</c> URI. The editor author may provide
+            a way to navigate the user to the specified web page if this is not <c>null</c>.</param>
+        <summary>Constructs <c>InputContentInfo</c> object with additional link URI.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo#InputContentInfo(android.net.Uri,%20android.content.ClipDescription)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputContentInfo.InputContentInfo(android.net.Uri, android.content.ClipDescription)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo#InputContentInfo(android.net.Uri,%20android.content.ClipDescription,%20android.net.Uri)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputContentInfo.InputContentInfo(android.net.Uri, android.content.ClipDescription, android.net.Uri)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo.xml
index 7d8bb8f08d..0fa33a5725 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodInfo.xml
@@ -116,14 +116,11 @@
         <param name="className">To be added.</param>
         <param name="label">To be added.</param>
         <param name="settingsActivity">To be added.</param>
-        <param name="context">The Context in which we are parsing the input method.</param>
-        <param name="service">The ResolveInfo returned from the package manager about
-            this input method's component.</param>
-        <summary>Constructor.</summary>
+        <summary>Temporary API for creating a built-in input method for test.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo#InputMethodInfo(android.content.Context,%20android.content.pm.ResolveInfo)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodInfo.InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo#InputMethodInfo(java.lang.String,%20java.lang.String,%20java.lang.CharSequence,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodInfo.InputMethodInfo(java.lang.String, java.lang.String, java.lang.CharSequence, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodManager.xml b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodManager.xml
index 949e39556b..e177e97dd8 100644
--- a/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodManager.xml
+++ b/docs/Mono.Android/en/Android.Views.InputMethods/InputMethodManager.xml
@@ -403,24 +403,22 @@
         <Parameter Name="resultReceiver" Type="Android.OS.ResultReceiver" />
       </Parameters>
       <Docs>
-        <param name="resultReceiver">If non-null, this will be called by the IME when
- it has processed your request to tell you what it has done.  The result
- code you receive may be either <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_UNCHANGED_SHOWN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_SHOWN">Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_SHOWN</a></format>,
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_UNCHANGED_HIDDEN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_HIDDEN">Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_HIDDEN</a></format>, <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_SHOWN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_SHOWN">Android.Views.InputMethods.InputMethodManager.RESULT_SHOWN</a></format>, or
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_HIDDEN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_HIDDEN">Android.Views.InputMethods.InputMethodManager.RESULT_HIDDEN</a></format>.
-</param>
         <param name="windowToken">The token of the window that is making the request,
             as returned by <c>View#getWindowToken() View.getWindowToken()</c>.</param>
         <param name="flags">Provides additional operating flags.  Currently may be
             0 or have the <c>#HIDE_IMPLICIT_ONLY</c> bit set.</param>
-        <summary>Synonym for <c>#hideSoftInputFromWindow(IBinder, int, ResultReceiver)</c>
-            without a result: request to hide the soft input window from the
-            context of the window that is currently accepting input.</summary>
+        <param name="resultReceiver">If non-null, this will be called by the IME when
+            it has processed your request to tell you what it has done.  The result
+            code you receive may be either <c>#RESULT_UNCHANGED_SHOWN</c>,
+            <c>#RESULT_UNCHANGED_HIDDEN</c>, <c>#RESULT_SHOWN</c>, or
+            <c>#RESULT_HIDDEN</c>.</param>
+        <summary>Request to hide the soft input window from the context of the window
+            that is currently accepting input.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager#hideSoftInputFromWindow(android.os.IBinder,%20int)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodManager.hideSoftInputFromWindow(android.os.IBinder, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager#hideSoftInputFromWindow(android.os.IBinder,%20int,%20android.os.ResultReceiver)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodManager.hideSoftInputFromWindow(android.os.IBinder, int, android.os.ResultReceiver)</code>.</a>
             </format>
           </para>
           <para>
@@ -539,12 +537,13 @@
       </Parameters>
       <Docs>
         <param name="view">To be added.</param>
-        <summary>Return true if any view is currently active in the input method.</summary>
+        <summary>Return true if the given view is the currently active view for the
+            input method.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager#isActive()" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodManager.isActive()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager#isActive(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodManager.isActive(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -1427,24 +1426,22 @@
         <Parameter Name="resultReceiver" Type="Android.OS.ResultReceiver" />
       </Parameters>
       <Docs>
-        <param name="resultReceiver">If non-null, this will be called by the IME when
- it has processed your request to tell you what it has done.  The result
- code you receive may be either <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_UNCHANGED_SHOWN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_SHOWN">Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_SHOWN</a></format>,
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_UNCHANGED_HIDDEN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_HIDDEN">Android.Views.InputMethods.InputMethodManager.RESULT_UNCHANGED_HIDDEN</a></format>, <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_SHOWN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_SHOWN">Android.Views.InputMethods.InputMethodManager.RESULT_SHOWN</a></format>, or
- <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search='Android Views InputMethods InputMethodManager RESULT_HIDDEN';scope=Xamarin" title="Android.Views.InputMethods.InputMethodManager.RESULT_HIDDEN">Android.Views.InputMethods.InputMethodManager.RESULT_HIDDEN</a></format>.
-</param>
         <param name="view">The currently focused view, which would like to receive
             soft keyboard input.</param>
         <param name="flags">Provides additional operating flags.  Currently may be
             0 or have the <c>#SHOW_IMPLICIT</c> bit set.</param>
-        <summary>Synonym for <c>#showSoftInput(View, int, ResultReceiver)</c> without
-            a result receiver: explicitly request that the current input method's
-            soft input area be shown to the user, if needed.</summary>
+        <param name="resultReceiver">If non-null, this will be called by the IME when
+            it has processed your request to tell you what it has done.  The result
+            code you receive may be either <c>#RESULT_UNCHANGED_SHOWN</c>,
+            <c>#RESULT_UNCHANGED_HIDDEN</c>, <c>#RESULT_SHOWN</c>, or
+            <c>#RESULT_HIDDEN</c>.</param>
+        <summary>Explicitly request that the current input method's soft input area be
+            shown to the user, if needed.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager#showSoftInput(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodManager.showSoftInput(android.view.View, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager#showSoftInput(android.view.View,%20int,%20android.os.ResultReceiver)" title="Reference documentation">Java documentation for <code>android.view.inputmethod.InputMethodManager.showSoftInput(android.view.View, int, android.os.ResultReceiver)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Inspectors/IPropertyReader.xml b/docs/Mono.Android/en/Android.Views.Inspectors/IPropertyReader.xml
index bc4cae4302..9af33c3ec9 100644
--- a/docs/Mono.Android/en/Android.Views.Inspectors/IPropertyReader.xml
+++ b/docs/Mono.Android/en/Android.Views.Inspectors/IPropertyReader.xml
@@ -178,11 +178,11 @@
       <Docs>
         <param name="id">Identifier of the property from a <c>PropertyMapper</c></param>
         <param name="value">Value of the property</param>
-        <summary>Read a color packed into a <c>ColorInt</c> as a property.</summary>
+        <summary>Read a <c>Color</c> object as a property.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inspector/PropertyReader#readColor(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.inspector.PropertyReader.readColor(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inspector/PropertyReader#readColor(int,%20android.graphics.Color)" title="Reference documentation">Java documentation for <code>android.view.inspector.PropertyReader.readColor(int, android.graphics.Color)</code>.</a>
             </format>
           </para>
           <para>
@@ -259,12 +259,13 @@
       </Parameters>
       <Docs>
         <param name="id">Identifier of the property from a <c>PropertyMapper</c></param>
-        <param name="value">Value of the property</param>
-        <summary>Read a color packed into a <c>ColorInt</c> as a property.</summary>
+        <param name="value">Value of the property packed as a <c>ColorLong</c>. See the
+                         <c>Color</c> class for details of the packing.</param>
+        <summary>Read a color packed into a <c>ColorLong</c> as a property.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/inspector/PropertyReader#readColor(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.inspector.PropertyReader.readColor(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/inspector/PropertyReader#readColor(int,%20long)" title="Reference documentation">Java documentation for <code>android.view.inspector.PropertyReader.readColor(int, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/ITextClassifier.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/ITextClassifier.xml
index af8070c162..b5f3e5578b 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/ITextClassifier.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/ITextClassifier.xml
@@ -107,18 +107,20 @@
         <Parameter Name="defaultLocales" Type="Android.OS.LocaleList" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="startIndex">To be added.</param>
-        <param name="endIndex">To be added.</param>
-        <param name="defaultLocales">To be added.</param>
-        <param name="request">the text classification request</param>
+        <param name="text">text providing context for the text to classify (which is specified
+                 by the sub sequence starting at startIndex and ending at endIndex)</param>
+        <param name="startIndex">start index of the text to classify</param>
+        <param name="endIndex">end index of the text to classify</param>
+        <param name="defaultLocales">ordered list of locale preferences that may be used to
+                 disambiguate the provided text. If no locale preferences exist, set this to null
+                 or an empty locale list.</param>
         <summary>Classifies the specified text and returns a <c>TextClassification</c> object that can be
             used to generate a widget for handling the classified text.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier#classifyText(android.view.textclassifier.Request)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.TextClassifier.classifyText(android.view.textclassifier.Request)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier#classifyText(java.lang.CharSequence,%20int,%20int,%20android.os.LocaleList)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.TextClassifier.classifyText(java.lang.CharSequence, int, int, android.os.LocaleList)</code>.</a>
             </format>
           </para>
           <para>
@@ -645,18 +647,20 @@
         <Parameter Name="defaultLocales" Type="Android.OS.LocaleList" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="selectionStartIndex">To be added.</param>
-        <param name="selectionEndIndex">To be added.</param>
-        <param name="defaultLocales">To be added.</param>
-        <param name="request">the text selection request</param>
+        <param name="text">text providing context for the selected text (which is specified
+                 by the sub sequence starting at selectionStartIndex and ending at selectionEndIndex)</param>
+        <param name="selectionStartIndex">start index of the selected part of text</param>
+        <param name="selectionEndIndex">end index of the selected part of text</param>
+        <param name="defaultLocales">ordered list of locale preferences that may be used to
+                 disambiguate the provided text. If no locale preferences exist, set this to null
+                 or an empty locale list.</param>
         <summary>Returns suggested text selection start and end indices, recognized entity types, and their
             associated confidence scores.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier#suggestSelection(android.view.textclassifier.Request)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.TextClassifier.suggestSelection(android.view.textclassifier.Request)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier#suggestSelection(java.lang.CharSequence,%20int,%20int,%20android.os.LocaleList)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.TextClassifier.suggestSelection(java.lang.CharSequence, int, int, android.os.LocaleList)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent.xml b/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent.xml
index 93ac2284d5..2889446566 100644
--- a/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent.xml
+++ b/docs/Mono.Android/en/Android.Views.TextClassifiers/SelectionEvent.xml
@@ -603,16 +603,17 @@
         <Parameter Name="classification" Type="Android.Views.TextClassifiers.TextClassification" />
       </Parameters>
       <Docs>
-        <param name="classification">To be added.</param>
         <param name="start">the start (inclusive) index of the selection</param>
         <param name="end">the end (exclusive) index of the selection</param>
         <param name="actionType">the action that was performed on the selection</param>
+        <param name="classification">the TextClassification object returned by the TextClassifier that
+                 classified the selected text</param>
         <summary>Creates an event specifying an action taken on a selection.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent#createSelectionActionEvent(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.SelectionEvent.createSelectionActionEvent(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent#createSelectionActionEvent(int,%20int,%20int,%20android.view.textclassifier.TextClassification)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.SelectionEvent.createSelectionActionEvent(int, int, int, android.view.textclassifier.TextClassification)</code>.</a>
             </format>
           </para>
           <para>
@@ -690,15 +691,16 @@
         <Parameter Name="classification" Type="Android.Views.TextClassifiers.TextClassification" />
       </Parameters>
       <Docs>
-        <param name="classification">To be added.</param>
         <param name="start">the start (inclusive) index of the selection</param>
         <param name="end">the end (exclusive) index of the selection</param>
+        <param name="classification">the TextClassification object returned by the TextClassifier that
+                 classified the selected text</param>
         <summary>Creates a "selection modified" event.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent#createSelectionModifiedEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.SelectionEvent.createSelectionModifiedEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent#createSelectionModifiedEvent(int,%20int,%20android.view.textclassifier.TextClassification)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.SelectionEvent.createSelectionModifiedEvent(int, int, android.view.textclassifier.TextClassification)</code>.</a>
             </format>
           </para>
           <para>
@@ -734,15 +736,16 @@
         <Parameter Name="selection" Type="Android.Views.TextClassifiers.TextSelection" />
       </Parameters>
       <Docs>
-        <param name="selection">To be added.</param>
         <param name="start">the start (inclusive) index of the selection</param>
         <param name="end">the end (exclusive) index of the selection</param>
+        <param name="selection">the TextSelection object returned by the TextClassifier for the
+                 specified selection</param>
         <summary>Creates a "selection modified" event.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent#createSelectionModifiedEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.SelectionEvent.createSelectionModifiedEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent#createSelectionModifiedEvent(int,%20int,%20android.view.textclassifier.TextSelection)" title="Reference documentation">Java documentation for <code>android.view.textclassifier.SelectionEvent.createSelectionModifiedEvent(int, int, android.view.textclassifier.TextSelection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo.xml b/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo.xml
index b928e16aec..1dfd2a8862 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/SentenceSuggestionsInfo.xml
@@ -69,9 +69,6 @@
       </Parameters>
       <Docs>
         <param name="source">To be added.</param>
-        <param name="suggestionsInfos">from the text service</param>
-        <param name="offsets">the array of offsets of suggestions</param>
-        <param name="lengths">the array of lengths of suggestions</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSession.xml b/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSession.xml
index afa0ac015c..7b02e76bc7 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSession.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/SpellCheckerSession.xml
@@ -250,14 +250,13 @@
       </Parameters>
       <Docs>
         <param name="textInfos">an array of text metadata for a spell checker</param>
-        <param name="sequentialWords">true if textInfos can be treated as sequential words.</param>
-        <param name="textInfo">text metadata for a spell checker</param>
         <param name="suggestionsLimit">the maximum number of suggestions that will be returned</param>
-        <summary>Get candidate strings for a substring of the specified text.</summary>
+        <param name="sequentialWords">true if textInfos can be treated as sequential words.</param>
+        <summary>A batch process of getSuggestions</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession#getSuggestions(android.view.textservice.TextInfo,%20int)" title="Reference documentation">Java documentation for <code>android.view.textservice.SpellCheckerSession.getSuggestions(android.view.textservice.TextInfo, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession#getSuggestions(android.view.textservice.TextInfo[],%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.textservice.SpellCheckerSession.getSuggestions(android.view.textservice.TextInfo[], int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo.xml b/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo.xml
index 79bbd6fff3..063bfd8f28 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/SuggestionsInfo.xml
@@ -68,8 +68,6 @@
       </Parameters>
       <Docs>
         <param name="source">To be added.</param>
-        <param name="suggestionsAttributes">from the text service</param>
-        <param name="suggestions">from the text service</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
@@ -155,15 +153,15 @@
         <Parameter Name="sequence" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cookie">To be added.</param>
-        <param name="sequence">To be added.</param>
         <param name="suggestionsAttributes">from the text service</param>
         <param name="suggestions">from the text service</param>
+        <param name="cookie">the cookie of the input TextInfo</param>
+        <param name="sequence">the cookie of the input TextInfo</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo#SuggestionsInfo(int,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>android.view.textservice.SuggestionsInfo.SuggestionsInfo(int, java.lang.String[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo#SuggestionsInfo(int,%20java.lang.String[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.textservice.SuggestionsInfo.SuggestionsInfo(int, java.lang.String[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.TextService/TextInfo.xml b/docs/Mono.Android/en/Android.Views.TextService/TextInfo.xml
index ea8ef9f86d..9ed8fea572 100644
--- a/docs/Mono.Android/en/Android.Views.TextService/TextInfo.xml
+++ b/docs/Mono.Android/en/Android.Views.TextService/TextInfo.xml
@@ -68,12 +68,6 @@
       </Parameters>
       <Docs>
         <param name="source">To be added.</param>
-        <param name="charSequence">the text which will be input to TextService. Attached spans that
-            implement <c>ParcelableSpan</c> will also be marshaled alongside with the text.</param>
-        <param name="start">the beginning of the range of text (inclusive).</param>
-        <param name="end">the end of the range of text (exclusive).</param>
-        <param name="cookie">the cookie for this TextInfo</param>
-        <param name="sequenceNumber">the sequence number for this TextInfo</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
@@ -110,18 +104,12 @@
         <Parameter Name="text" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="charSequence">the text which will be input to TextService. Attached spans that
-            implement <c>ParcelableSpan</c> will also be marshaled alongside with the text.</param>
-        <param name="start">the beginning of the range of text (inclusive).</param>
-        <param name="end">the end of the range of text (exclusive).</param>
-        <param name="cookie">the cookie for this TextInfo</param>
-        <param name="sequenceNumber">the sequence number for this TextInfo</param>
+        <param name="text">the text which will be input to TextService</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textservice/TextInfo#TextInfo(java.lang.CharSequence,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.textservice.TextInfo.TextInfo(java.lang.CharSequence, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textservice/TextInfo#TextInfo(java.lang.String)" title="Reference documentation">Java documentation for <code>android.view.textservice.TextInfo.TextInfo(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,18 +143,14 @@
         <Parameter Name="sequenceNumber" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="charSequence">the text which will be input to TextService. Attached spans that
-            implement <c>ParcelableSpan</c> will also be marshaled alongside with the text.</param>
-        <param name="start">the beginning of the range of text (inclusive).</param>
-        <param name="end">the end of the range of text (exclusive).</param>
+        <param name="text">the text which will be input to TextService</param>
         <param name="cookie">the cookie for this TextInfo</param>
         <param name="sequenceNumber">the sequence number for this TextInfo</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/textservice/TextInfo#TextInfo(java.lang.CharSequence,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.textservice.TextInfo.TextInfo(java.lang.CharSequence, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/textservice/TextInfo#TextInfo(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.textservice.TextInfo.TextInfo(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views.Translation/TranslationManager.xml b/docs/Mono.Android/en/Android.Views.Translation/TranslationManager.xml
index c2e8c63c8b..3498c0ff2a 100644
--- a/docs/Mono.Android/en/Android.Views.Translation/TranslationManager.xml
+++ b/docs/Mono.Android/en/Android.Views.Translation/TranslationManager.xml
@@ -59,12 +59,14 @@
       </Parameters>
       <Docs>
         <param name="executor">To be added.</param>
-        <param name="capabilityListener">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="capabilityListener">a <c>TranslationCapability</c> Consumer to receive the updated
+            <c>TranslationCapability</c> from the on-device translation service.</param>
+        <summary>Adds a <c>TranslationCapability</c> Consumer to listen for updates on states of on-device
+            <c>TranslationCapability</c>s.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/translation/TranslationManager#addOnDeviceTranslationCapabilityUpdateListener(int,%20int,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.view.translation.TranslationManager.addOnDeviceTranslationCapabilityUpdateListener(int, int, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/translation/TranslationManager#addOnDeviceTranslationCapabilityUpdateListener(java.util.concurrent.Executor,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.view.translation.TranslationManager.addOnDeviceTranslationCapabilityUpdateListener(java.util.concurrent.Executor, java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
@@ -100,16 +102,18 @@
         <Parameter Name="callback" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
-        <param name="callback">To be added.</param>
         <param name="translationContext">
           <c>TranslationContext</c> containing the specs for creating the
                                                                 Translator.</param>
+        <param name="executor">Executor to run callback operations</param>
+        <param name="callback">
+          <c>Consumer</c> to receive the translator. A <c>null</c> value is returned
+                                            if the service could not create the translator.</param>
         <summary>Creates an on-device Translator for natural language translation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/translation/TranslationManager#createOnDeviceTranslator(android.view.translation.TranslationContext)" title="Reference documentation">Java documentation for <code>android.view.translation.TranslationManager.createOnDeviceTranslator(android.view.translation.TranslationContext)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/translation/TranslationManager#createOnDeviceTranslator(android.view.translation.TranslationContext,%20java.util.concurrent.Executor,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.view.translation.TranslationManager.createOnDeviceTranslator(android.view.translation.TranslationContext, java.util.concurrent.Executor, java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
@@ -270,12 +274,13 @@
         <Parameter Name="capabilityListener" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="capabilityListener">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="capabilityListener">the <c>TranslationCapability</c> Consumer to unregister</param>
+        <summary>Removes a <c>TranslationCapability</c> Consumer to listen for updates on states of
+            on-device <c>TranslationCapability</c>s.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/translation/TranslationManager#removeOnDeviceTranslationCapabilityUpdateListener(int,%20int,%20android.app.PendingIntent)" title="Reference documentation">Java documentation for <code>android.view.translation.TranslationManager.removeOnDeviceTranslationCapabilityUpdateListener(int, int, android.app.PendingIntent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/translation/TranslationManager#removeOnDeviceTranslationCapabilityUpdateListener(java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.view.translation.TranslationManager.removeOnDeviceTranslationCapabilityUpdateListener(java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/AbsSavedState.xml b/docs/Mono.Android/en/Android.Views/AbsSavedState.xml
index ff677675bb..843152aa59 100644
--- a/docs/Mono.Android/en/Android.Views/AbsSavedState.xml
+++ b/docs/Mono.Android/en/Android.Views/AbsSavedState.xml
@@ -68,12 +68,12 @@
         <Parameter Name="superState" Type="Android.OS.IParcelable" />
       </Parameters>
       <Docs>
-        <param name="superState">To be added.</param>
-        <summary>Constructor used to make the EMPTY_STATE singleton</summary>
+        <param name="superState">The state of the superclass of this view</param>
+        <summary>Constructor called by derived classes when creating their SavedState objects</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/AbsSavedState#AbsSavedState()" title="Reference documentation">Java documentation for <code>android.view.AbsSavedState.AbsSavedState()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/AbsSavedState#AbsSavedState(android.os.Parcelable)" title="Reference documentation">Java documentation for <code>android.view.AbsSavedState.AbsSavedState(android.os.Parcelable)</code>.</a>
             </format>
           </para>
           <para>
@@ -105,12 +105,12 @@
         <Parameter Name="source" Type="Android.OS.Parcel" />
       </Parameters>
       <Docs>
-        <param name="source">To be added.</param>
-        <summary>Constructor used to make the EMPTY_STATE singleton</summary>
+        <param name="source">parcel to read from</param>
+        <summary>Constructor used when reading from a parcel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/AbsSavedState#AbsSavedState()" title="Reference documentation">Java documentation for <code>android.view.AbsSavedState.AbsSavedState()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/AbsSavedState#AbsSavedState(android.os.Parcel)" title="Reference documentation">Java documentation for <code>android.view.AbsSavedState.AbsSavedState(android.os.Parcel)</code>.</a>
             </format>
           </para>
           <para>
@@ -143,13 +143,13 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="source">To be added.</param>
-        <param name="loader">To be added.</param>
-        <summary>Constructor used to make the EMPTY_STATE singleton</summary>
+        <param name="source">parcel to read from</param>
+        <param name="loader">ClassLoader to use for reading</param>
+        <summary>Constructor used when reading from a parcel using a given class loader.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/AbsSavedState#AbsSavedState()" title="Reference documentation">Java documentation for <code>android.view.AbsSavedState.AbsSavedState()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/AbsSavedState#AbsSavedState(android.os.Parcel,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>android.view.AbsSavedState.AbsSavedState(android.os.Parcel, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ActionProvider.xml b/docs/Mono.Android/en/Android.Views/ActionProvider.xml
index c65acd37af..fb7aaf60e5 100644
--- a/docs/Mono.Android/en/Android.Views/ActionProvider.xml
+++ b/docs/Mono.Android/en/Android.Views/ActionProvider.xml
@@ -264,11 +264,11 @@
       <Docs>
         <param name="forItem">MenuItem to create the action view for</param>
         <summary>Factory method called by the Android framework to create new action views.</summary>
-        <returns>A new action view.</returns>
+        <returns>the new action view</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ActionProvider#onCreateActionView()" title="Reference documentation">Java documentation for <code>android.view.ActionProvider.onCreateActionView()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ActionProvider#onCreateActionView(android.view.MenuItem)" title="Reference documentation">Java documentation for <code>android.view.ActionProvider.onCreateActionView(android.view.MenuItem)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ContextThemeWrapper.xml b/docs/Mono.Android/en/Android.Views/ContextThemeWrapper.xml
index d186427e37..ba805df9d9 100644
--- a/docs/Mono.Android/en/Android.Views/ContextThemeWrapper.xml
+++ b/docs/Mono.Android/en/Android.Views/ContextThemeWrapper.xml
@@ -127,13 +127,14 @@
         <Parameter Name="themeResId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="base">To be added.</param>
-        <param name="themeResId">To be added.</param>
-        <summary>Creates a new context wrapper with no theme and no base context.</summary>
+        <param name="base">the base context</param>
+        <param name="themeResId">the resource ID of the theme to be applied on top of
+                              the base context's theme</param>
+        <summary>Creates a new context wrapper with the specified theme.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ContextThemeWrapper#ContextThemeWrapper()" title="Reference documentation">Java documentation for <code>android.view.ContextThemeWrapper.ContextThemeWrapper()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ContextThemeWrapper#ContextThemeWrapper(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.view.ContextThemeWrapper.ContextThemeWrapper(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/DisplayCutout.xml b/docs/Mono.Android/en/Android.Views/DisplayCutout.xml
index 38365ed7ca..7748ec6984 100644
--- a/docs/Mono.Android/en/Android.Views/DisplayCutout.xml
+++ b/docs/Mono.Android/en/Android.Views/DisplayCutout.xml
@@ -58,17 +58,9 @@
         <Parameter Name="boundingRects" Type="System.Collections.Generic.IList&lt;Android.Graphics.Rect&gt;" />
       </Parameters>
       <Docs>
-        <param name="boundingRects">To be added.</param>
         <param name="safeInsets">the insets from each edge which avoid the display cutout as returned by
                               <c>#getSafeInsetTop()</c> etc.</param>
-        <param name="boundLeft">the left bounding rect of the display cutout in pixels. If null is passed,
-                             it's treated as an empty rectangle (0,0)-(0,0).</param>
-        <param name="boundTop">the top bounding rect of the display cutout in pixels.  If null is passed,
-                             it's treated as an empty rectangle (0,0)-(0,0).</param>
-        <param name="boundRight">the right bounding rect of the display cutout in pixels.  If null is
-                             passed, it's treated as an empty rectangle (0,0)-(0,0).</param>
-        <param name="boundBottom">the bottom bounding rect of the display cutout in pixels.  If null is
-                              passed, it's treated as an empty rectangle (0,0)-(0,0).</param>
+        <param name="boundingRects">To be added.</param>
         <summary>Creates a DisplayCutout instance.</summary>
         <remarks>
           <para>
@@ -158,7 +150,6 @@
         <Parameter Name="waterfallInsets" Type="Android.Graphics.Insets" />
       </Parameters>
       <Docs>
-        <param name="waterfallInsets">To be added.</param>
         <param name="safeInsets">the insets from each edge which avoid the display cutout as returned by
                               <c>#getSafeInsetTop()</c> etc.</param>
         <param name="boundLeft">the left bounding rect of the display cutout in pixels. If null is passed,
@@ -169,11 +160,12 @@
                              passed, it's treated as an empty rectangle (0,0)-(0,0).</param>
         <param name="boundBottom">the bottom bounding rect of the display cutout in pixels.  If null is
                               passed, it's treated as an empty rectangle (0,0)-(0,0).</param>
+        <param name="waterfallInsets">the insets for the curved areas in waterfall display.</param>
         <summary>Creates a DisplayCutout instance.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/DisplayCutout#DisplayCutout(android.graphics.Insets,%20android.graphics.Rect,%20android.graphics.Rect,%20android.graphics.Rect,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.DisplayCutout.DisplayCutout(android.graphics.Insets, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/DisplayCutout#DisplayCutout(android.graphics.Insets,%20android.graphics.Rect,%20android.graphics.Rect,%20android.graphics.Rect,%20android.graphics.Rect,%20android.graphics.Insets)" title="Reference documentation">Java documentation for <code>android.view.DisplayCutout.DisplayCutout(android.graphics.Insets, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Rect, android.graphics.Insets)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/FrameMetrics.xml b/docs/Mono.Android/en/Android.Views/FrameMetrics.xml
index ba758d03c1..3857e4faf8 100644
--- a/docs/Mono.Android/en/Android.Views/FrameMetrics.xml
+++ b/docs/Mono.Android/en/Android.Views/FrameMetrics.xml
@@ -54,10 +54,19 @@
         <Parameter Name="other" Type="Android.Views.FrameMetrics" />
       </Parameters>
       <Docs>
-        <param name="other">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="other">the FrameMetrics object to copy.</param>
+        <summary>Constructs a FrameMetrics object as a copy.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/FrameMetrics#FrameMetrics(android.view.FrameMetrics)" title="Reference documentation">Java documentation for <code>android.view.FrameMetrics.FrameMetrics(android.view.FrameMetrics)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.Views/GestureDetector.xml b/docs/Mono.Android/en/Android.Views/GestureDetector.xml
index e84f9093dc..ec593fd503 100644
--- a/docs/Mono.Android/en/Android.Views/GestureDetector.xml
+++ b/docs/Mono.Android/en/Android.Views/GestureDetector.xml
@@ -58,8 +58,6 @@
         <Parameter Name="listener" Type="Android.Views.GestureDetector+IOnGestureListener" />
       </Parameters>
       <Docs>
-        <param name="context">An <c>android.app.Activity</c> or a <c>Context</c> created from
-            <c>Context#createWindowContext(int, Bundle)</c></param>
         <param name="listener">the listener invoked for all the callbacks, this must
             not be null. If the listener implements the <c>OnDoubleTapListener</c> or
             <c>OnContextClickListener</c> then it will also be set as the listener for
@@ -153,13 +151,11 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
-        <param name="context">An <c>android.app.Activity</c> or a <c>Context</c> created from
-            <c>Context#createWindowContext(int, Bundle)</c></param>
         <param name="listener">the listener invoked for all the callbacks, this must
             not be null. If the listener implements the <c>OnDoubleTapListener</c> or
             <c>OnContextClickListener</c> then it will also be set as the listener for
             these callbacks (for example when using the <c>SimpleOnGestureListener</c>).</param>
+        <param name="handler">To be added.</param>
         <summary>Creates a GestureDetector with the supplied listener.</summary>
         <remarks>
           <para>
@@ -223,13 +219,13 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="context">An <c>android.app.Activity</c> or a <c>Context</c> created from
             <c>Context#createWindowContext(int, Bundle)</c></param>
         <param name="listener">the listener invoked for all the callbacks, this must
             not be null. If the listener implements the <c>OnDoubleTapListener</c> or
             <c>OnContextClickListener</c> then it will also be set as the listener for
             these callbacks (for example when using the <c>SimpleOnGestureListener</c>).</param>
+        <param name="handler">To be added.</param>
         <summary>Creates a GestureDetector with the supplied listener.</summary>
         <remarks>
           <para>
@@ -272,14 +268,14 @@
         <Parameter Name="unused" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
-        <param name="unused">To be added.</param>
         <param name="context">An <c>android.app.Activity</c> or a <c>Context</c> created from
             <c>Context#createWindowContext(int, Bundle)</c></param>
         <param name="listener">the listener invoked for all the callbacks, this must
             not be null. If the listener implements the <c>OnDoubleTapListener</c> or
             <c>OnContextClickListener</c> then it will also be set as the listener for
             these callbacks (for example when using the <c>SimpleOnGestureListener</c>).</param>
+        <param name="handler">To be added.</param>
+        <param name="unused">To be added.</param>
         <summary>Creates a GestureDetector with the supplied listener.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/Gravity.xml b/docs/Mono.Android/en/Android.Views/Gravity.xml
index ab1b6b6b5e..37ce120362 100644
--- a/docs/Mono.Android/en/Android.Views/Gravity.xml
+++ b/docs/Mono.Android/en/Android.Views/Gravity.xml
@@ -124,21 +124,13 @@
         <param name="container">The frame of the containing space, in which the object
                              will be placed.  Should be large enough to contain the
                              width and height of the object.</param>
-        <param name="xAdj">Offset to apply to the X axis.  If gravity is LEFT this
-                        pushes it to the right; if gravity is RIGHT it pushes it to
-                        the left; if gravity is CENTER_HORIZONTAL it pushes it to the
-                        right or left; otherwise it is ignored.</param>
-        <param name="yAdj">Offset to apply to the Y axis.  If gravity is TOP this pushes
-                        it down; if gravity is BOTTOM it pushes it up; if gravity is
-                        CENTER_VERTICAL it pushes it down or up; otherwise it is
-                        ignored.</param>
         <param name="outRect">Receives the computed frame of the object in its
                            container.</param>
         <summary>Apply a gravity constant to an object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Gravity#apply(int,%20int,%20int,%20android.graphics.Rect,%20int,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.Gravity.apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Gravity#apply(int,%20int,%20int,%20android.graphics.Rect,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.Gravity.apply(int, int, int, android.graphics.Rect, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,7 +177,6 @@
         <Parameter Name="layoutDirection" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="layoutDirection">The layout direction.</param>
         <param name="gravity">The desired placement of the object, as defined by the
                            constants in this class.</param>
         <param name="w">The horizontal size of the object.</param>
@@ -193,21 +184,14 @@
         <param name="container">The frame of the containing space, in which the object
                              will be placed.  Should be large enough to contain the
                              width and height of the object.</param>
-        <param name="xAdj">Offset to apply to the X axis.  If gravity is LEFT this
-                        pushes it to the right; if gravity is RIGHT it pushes it to
-                        the left; if gravity is CENTER_HORIZONTAL it pushes it to the
-                        right or left; otherwise it is ignored.</param>
-        <param name="yAdj">Offset to apply to the Y axis.  If gravity is TOP this pushes
-                        it down; if gravity is BOTTOM it pushes it up; if gravity is
-                        CENTER_VERTICAL it pushes it down or up; otherwise it is
-                        ignored.</param>
         <param name="outRect">Receives the computed frame of the object in its
                            container.</param>
-        <summary>Apply a gravity constant to an object.</summary>
+        <param name="layoutDirection">The layout direction.</param>
+        <summary>Apply a gravity constant to an object and take care if layout direction is RTL or not.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Gravity#apply(int,%20int,%20int,%20android.graphics.Rect,%20int,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.Gravity.apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Gravity#apply(int,%20int,%20int,%20android.graphics.Rect,%20android.graphics.Rect,%20int)" title="Reference documentation">Java documentation for <code>android.view.Gravity.apply(int, int, int, android.graphics.Rect, android.graphics.Rect, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -327,7 +311,6 @@
         <Parameter Name="layoutDirection" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="layoutDirection">The layout direction.</param>
         <param name="gravity">The desired placement of the object, as defined by the
                            constants in this class.</param>
         <param name="w">The horizontal size of the object.</param>
@@ -345,11 +328,12 @@
                         ignored.</param>
         <param name="outRect">Receives the computed frame of the object in its
                            container.</param>
+        <param name="layoutDirection">The layout direction.</param>
         <summary>Apply a gravity constant to an object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Gravity#apply(int,%20int,%20int,%20android.graphics.Rect,%20int,%20int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.Gravity.apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Gravity#apply(int,%20int,%20int,%20android.graphics.Rect,%20int,%20int,%20android.graphics.Rect,%20int)" title="Reference documentation">Java documentation for <code>android.view.Gravity.apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -451,19 +435,19 @@
         <Parameter Name="layoutDirection" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="layoutDirection">The layout direction.</param>
         <param name="gravity">Gravity constants to modify the placement within the
             display.</param>
         <param name="display">The rectangle of the display in which the object is
             being placed.</param>
         <param name="inoutObj">Supplies the current object position; returns with it
             modified if needed to fit in the display.</param>
+        <param name="layoutDirection">The layout direction.</param>
         <summary>Apply additional gravity behavior based on the overall "display" that an
             object exists in.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Gravity#applyDisplay(int,%20android.graphics.Rect,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.Gravity.applyDisplay(int, android.graphics.Rect, android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Gravity#applyDisplay(int,%20android.graphics.Rect,%20android.graphics.Rect,%20int)" title="Reference documentation">Java documentation for <code>android.view.Gravity.applyDisplay(int, android.graphics.Rect, android.graphics.Rect, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/IContextMenu.xml b/docs/Mono.Android/en/Android.Views/IContextMenu.xml
index 1c953014c1..72707b334b 100644
--- a/docs/Mono.Android/en/Android.Views/IContextMenu.xml
+++ b/docs/Mono.Android/en/Android.Views/IContextMenu.xml
@@ -105,15 +105,14 @@
         <Parameter Name="icon" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="icon">The <see cref="T:Android.Graphics.Drawables.Drawable" /> used for the icon.</param>
-        <param name="iconRes">The resource identifier used for the icon.</param>
-        <summary>Sets the context menu header's icon to the icon given in &lt;var&gt;iconRes&lt;/var&gt;
-            resource id.</summary>
+        <param name="icon">The <c>Drawable</c> used for the icon.</param>
+        <summary>Sets the context menu header's icon to the icon given in &lt;var&gt;icon&lt;/var&gt;
+            <c>Drawable</c>.</summary>
         <returns>This ContextMenu so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ContextMenu#setHeaderIcon(int)" title="Reference documentation">Java documentation for <code>android.view.ContextMenu.setHeaderIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ContextMenu#setHeaderIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.view.ContextMenu.setHeaderIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -191,14 +190,12 @@
       </Parameters>
       <Docs>
         <param name="title">The character sequence used for the title.</param>
-        <param name="titleRes">The string resource identifier used for the title.</param>
-        <summary>Sets the context menu header's title to the title given in &lt;var&gt;titleRes&lt;/var&gt;
-            resource identifier.</summary>
+        <summary>Sets the context menu header's title to the title given in &lt;var&gt;title&lt;/var&gt;.</summary>
         <returns>This ContextMenu so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ContextMenu#setHeaderTitle(int)" title="Reference documentation">Java documentation for <code>android.view.ContextMenu.setHeaderTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ContextMenu#setHeaderTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.ContextMenu.setHeaderTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/IMenu.xml b/docs/Mono.Android/en/Android.Views/IMenu.xml
index 4d6f68438c..1087479856 100644
--- a/docs/Mono.Android/en/Android.Views/IMenu.xml
+++ b/docs/Mono.Android/en/Android.Views/IMenu.xml
@@ -65,13 +65,12 @@
       </Parameters>
       <Docs>
         <param name="title">The text to display for the item.</param>
-        <param name="titleRes">Resource identifier of title string.</param>
         <summary>Add a new item to the menu.</summary>
         <returns>The newly added menu item.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Menu#add(int)" title="Reference documentation">Java documentation for <code>android.view.Menu.add(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Menu#add(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.Menu.add(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -151,21 +150,20 @@
       </Parameters>
       <Docs>
         <param name="groupId">The group identifier that this item should be part of.
-        This can be used to define groups of items for batch state
-        changes. Normally use <see cref="F:Android.Views.Menu.None" /> if an item should not be in a
-        group.</param>
-        <param name="itemId">Unique item ID. Use <see cref="F:Android.Views.Menu.None" /> if you do not need a
-        unique ID.</param>
-        <param name="order">The order for the item. Use <see cref="F:Android.Views.Menu.None" /> if you do not care
-        about the order. See <see cref="P:Android.Views.IMenuItem.Order" />.</param>
+                   This can be used to define groups of items for batch state
+                   changes. Normally use <c>#NONE</c> if an item should not be in a
+                   group.</param>
+        <param name="itemId">Unique item ID. Use <c>#NONE</c> if you do not need a
+                   unique ID.</param>
+        <param name="order">The order for the item. Use <c>#NONE</c> if you do not care
+                   about the order. See <c>MenuItem#getOrder()</c>.</param>
         <param name="title">The text to display for the item.</param>
-        <param name="titleRes">Resource identifier of title string.</param>
         <summary>Add a new item to the menu.</summary>
         <returns>The newly added menu item.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Menu#add(int)" title="Reference documentation">Java documentation for <code>android.view.Menu.add(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Menu#add(int,%20int,%20int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.Menu.add(int, int, int, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -204,20 +202,21 @@
       </Parameters>
       <Docs>
         <param name="groupId">The group identifier that this item should be part of.
-        This can also be used to define groups of items for batch state
-        changes. Normally use <see cref="F:Android.Views.Menu.None" /> if an item should not be in a
-        group.</param>
-        <param name="itemId">Unique item ID. Use <see cref="F:Android.Views.Menu.None" /> if you do not need a
-        unique ID.</param>
-        <param name="order">The order for the item. Use <see cref="F:Android.Views.Menu.None" /> if you do not care
-        about the order. See <see cref="P:Android.Views.IMenuItem.Order" />.</param>
+                   This can also be used to define groups of items for batch state
+                   changes. Normally use <c>#NONE</c> if an item should not be in a
+                   group.</param>
+        <param name="itemId">Unique item ID. Use <c>#NONE</c> if you do not need a
+                   unique ID.</param>
+        <param name="order">The order for the item. Use <c>#NONE</c> if you do not care
+                   about the order. See <c>MenuItem#getOrder()</c>.</param>
         <param name="titleRes">Resource identifier of title string.</param>
-        <summary>Add a new item to the menu.</summary>
+        <summary>Variation on <c>#add(int, int, int, CharSequence)</c> that takes a
+            string resource identifier instead of the string itself.</summary>
         <returns>The newly added menu item.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Menu#add(int)" title="Reference documentation">Java documentation for <code>android.view.Menu.add(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Menu#add(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.Menu.add(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -329,13 +328,12 @@
       </Parameters>
       <Docs>
         <param name="title">The text to display for the item.</param>
-        <param name="titleRes">Resource identifier of title string.</param>
         <summary>Add a new sub-menu to the menu.</summary>
         <returns>The newly added sub-menu</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Menu#addSubMenu(int)" title="Reference documentation">Java documentation for <code>android.view.Menu.addSubMenu(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Menu#addSubMenu(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.Menu.addSubMenu(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -415,21 +413,20 @@
       </Parameters>
       <Docs>
         <param name="groupId">The group identifier that this item should be part of.
-        This can also be used to define groups of items for batch state
-        changes. Normally use <see cref="F:Android.Views.Menu.None" /> if an item should not be in a
-        group.</param>
-        <param name="itemId">Unique item ID. Use <see cref="F:Android.Views.Menu.None" /> if you do not need a
-        unique ID.</param>
-        <param name="order">The order for the item. Use <see cref="F:Android.Views.Menu.None" /> if you do not care
-        about the order. See <see cref="P:Android.Views.IMenuItem.Order" />.</param>
+                   This can also be used to define groups of items for batch state
+                   changes. Normally use <c>#NONE</c> if an item should not be in a
+                   group.</param>
+        <param name="itemId">Unique item ID. Use <c>#NONE</c> if you do not need a
+                   unique ID.</param>
+        <param name="order">The order for the item. Use <c>#NONE</c> if you do not care
+                   about the order. See <c>MenuItem#getOrder()</c>.</param>
         <param name="title">The text to display for the item.</param>
-        <param name="titleRes">Resource identifier of title string.</param>
         <summary>Add a new sub-menu to the menu.</summary>
         <returns>The newly added sub-menu</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Menu#addSubMenu(int)" title="Reference documentation">Java documentation for <code>android.view.Menu.addSubMenu(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Menu#addSubMenu(int,%20int,%20int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.Menu.addSubMenu(int, int, int, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -468,18 +465,19 @@
       </Parameters>
       <Docs>
         <param name="groupId">The group identifier that this item should be part of.
-        This can also be used to define groups of items for batch state
-        changes. Normally use <see cref="F:Android.Views.Menu.None" /> if an item should not be in a group.</param>
-        <param name="itemId">Unique item ID. Use <see cref="F:Android.Views.Menu.None" /> if you do not need a unique ID.</param>
-        <param name="order">The order for the item. Use <see cref="F:Android.Views.Menu.None" /> if you do not care about the
-        order. See <see cref="P:Android.Views.IMenuItem.Order" />.</param>
+                   This can also be used to define groups of items for batch state
+                   changes. Normally use <c>#NONE</c> if an item should not be in a group.</param>
+        <param name="itemId">Unique item ID. Use <c>#NONE</c> if you do not need a unique ID.</param>
+        <param name="order">The order for the item. Use <c>#NONE</c> if you do not care about the
+                   order. See <c>MenuItem#getOrder()</c>.</param>
         <param name="titleRes">Resource identifier of title string.</param>
-        <summary>Add a new sub-menu to the menu.</summary>
+        <summary>Variation on <c>#addSubMenu(int, int, int, CharSequence)</c> that takes
+            a string resource identifier for the title instead of the string itself.</summary>
         <returns>The newly added sub-menu</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Menu#addSubMenu(int)" title="Reference documentation">Java documentation for <code>android.view.Menu.addSubMenu(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Menu#addSubMenu(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.Menu.addSubMenu(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/IMenuItem.xml b/docs/Mono.Android/en/Android.Views/IMenuItem.xml
index eeceb3b75a..3b1c74516f 100644
--- a/docs/Mono.Android/en/Android.Views/IMenuItem.xml
+++ b/docs/Mono.Android/en/Android.Views/IMenuItem.xml
@@ -878,13 +878,12 @@
       </Parameters>
       <Docs>
         <param name="view">View to use for presenting this item to the user.</param>
-        <param name="resId">Layout resource to use for presenting this item to the user.</param>
         <summary>Set an action view for this menu item.</summary>
         <returns>This Item so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MenuItem#setActionView(int)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setActionView(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MenuItem#setActionView(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setActionView(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -1005,15 +1004,18 @@
         <Parameter Name="alphaModifiers" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="alphaModifiers">To be added.</param>
         <param name="alphaChar">The alphabetic shortcut key. This is the shortcut when
                    using a keyboard with alphabetic keys.</param>
+        <param name="alphaModifiers">The modifier associated with the shortcut. It should
+                   be a combination of <c>KeyEvent#META_META_ON</c>, <c>KeyEvent#META_CTRL_ON</c>,
+                   <c>KeyEvent#META_ALT_ON</c>, <c>KeyEvent#META_SHIFT_ON</c>,
+                   <c>KeyEvent#META_SYM_ON</c>, <c>KeyEvent#META_FUNCTION_ON</c>.</param>
         <summary>Change the alphabetic shortcut associated with this item.</summary>
         <returns>This Item so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MenuItem#setAlphabeticShortcut(char)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setAlphabeticShortcut(char)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MenuItem#setAlphabeticShortcut(char,%20int)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setAlphabeticShortcut(char, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1252,13 +1254,12 @@
       </Parameters>
       <Docs>
         <param name="icon">The new icon (as a Drawable) to be displayed.</param>
-        <param name="iconRes">The new icon (as a resource ID) to be displayed.</param>
         <summary>Change the icon associated with this item.</summary>
         <returns>This Item so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MenuItem#setIcon(int)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MenuItem#setIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1545,15 +1546,18 @@
         <Parameter Name="numericModifiers" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="numericModifiers">To be added.</param>
         <param name="numericChar">The numeric shortcut key.  This is the shortcut when
                             using a 12-key (numeric) keyboard.</param>
-        <summary>Change the numeric shortcut associated with this item.</summary>
+        <param name="numericModifiers">The modifier associated with the shortcut. It should
+                   be a combination of <c>KeyEvent#META_META_ON</c>, <c>KeyEvent#META_CTRL_ON</c>,
+                   <c>KeyEvent#META_ALT_ON</c>, <c>KeyEvent#META_SHIFT_ON</c>,
+                   <c>KeyEvent#META_SYM_ON</c>, <c>KeyEvent#META_FUNCTION_ON</c>.</param>
+        <summary>Change the numeric shortcut and modifiers associated with this item.</summary>
         <returns>This Item so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MenuItem#setNumericShortcut(char)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setNumericShortcut(char)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MenuItem#setNumericShortcut(char,%20int)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setNumericShortcut(char, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1721,19 +1725,25 @@
         <Parameter Name="alphaModifiers" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="numericModifiers">To be added.</param>
-        <param name="alphaModifiers">To be added.</param>
         <param name="numericChar">The numeric shortcut key. This is the shortcut when
                    using a numeric (e.g., 12-key) keyboard.</param>
+        <param name="numericModifiers">The numeric modifier associated with the shortcut. It should
+                   be a combination of <c>KeyEvent#META_META_ON</c>, <c>KeyEvent#META_CTRL_ON</c>,
+                   <c>KeyEvent#META_ALT_ON</c>, <c>KeyEvent#META_SHIFT_ON</c>,
+                   <c>KeyEvent#META_SYM_ON</c>, <c>KeyEvent#META_FUNCTION_ON</c>.</param>
         <param name="alphaChar">The alphabetic shortcut key. This is the shortcut when
                    using a keyboard with alphabetic keys.</param>
+        <param name="alphaModifiers">The alphabetic modifier associated with the shortcut. It should
+                   be a combination of <c>KeyEvent#META_META_ON</c>, <c>KeyEvent#META_CTRL_ON</c>,
+                   <c>KeyEvent#META_ALT_ON</c>, <c>KeyEvent#META_SHIFT_ON</c>,
+                   <c>KeyEvent#META_SYM_ON</c>, <c>KeyEvent#META_FUNCTION_ON</c>.</param>
         <summary>Change both the numeric and alphabetic shortcut associated with this
             item.</summary>
         <returns>This Item so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MenuItem#setShortcut(char,%20char)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setShortcut(char, char)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MenuItem#setShortcut(char,%20char,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setShortcut(char, char, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1870,13 +1880,13 @@
         <Parameter Name="title" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="title">The resource id of the new text to be displayed.</param>
+        <param name="title">The new text to be displayed.</param>
         <summary>Change the title associated with this item.</summary>
         <returns>This Item so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MenuItem#setTitle(int)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MenuItem#setTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.MenuItem.setTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ISubMenu.xml b/docs/Mono.Android/en/Android.Views/ISubMenu.xml
index d3b829fcf9..ff7147e384 100644
--- a/docs/Mono.Android/en/Android.Views/ISubMenu.xml
+++ b/docs/Mono.Android/en/Android.Views/ISubMenu.xml
@@ -133,15 +133,14 @@
         <Parameter Name="icon" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="icon">The <see cref="T:Android.Graphics.Drawables.Drawable" /> used for the icon.</param>
-        <param name="iconRes">The resource identifier used for the icon.</param>
-        <summary>Sets the submenu header's icon to the icon given in &lt;var&gt;iconRes&lt;/var&gt;
-            resource id.</summary>
+        <param name="icon">The <c>Drawable</c> used for the icon.</param>
+        <summary>Sets the submenu header's icon to the icon given in &lt;var&gt;icon&lt;/var&gt;
+            <c>Drawable</c>.</summary>
         <returns>This SubMenu so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/SubMenu#setHeaderIcon(int)" title="Reference documentation">Java documentation for <code>android.view.SubMenu.setHeaderIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/SubMenu#setHeaderIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.view.SubMenu.setHeaderIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -219,14 +218,12 @@
       </Parameters>
       <Docs>
         <param name="title">The character sequence used for the title.</param>
-        <param name="titleRes">The string resource identifier used for the title.</param>
-        <summary>Sets the submenu header's title to the title given in &lt;var&gt;titleRes&lt;/var&gt;
-            resource identifier.</summary>
+        <summary>Sets the submenu header's title to the title given in &lt;var&gt;title&lt;/var&gt;.</summary>
         <returns>This SubMenu so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/SubMenu#setHeaderTitle(int)" title="Reference documentation">Java documentation for <code>android.view.SubMenu.setHeaderTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/SubMenu#setHeaderTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.SubMenu.setHeaderTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -346,13 +343,12 @@
       </Parameters>
       <Docs>
         <param name="icon">The new icon (as a Drawable) to be displayed.</param>
-        <param name="iconRes">The new icon (as a resource ID) to be displayed.</param>
         <summary>Change the icon associated with this submenu's item in its parent menu.</summary>
         <returns>This SubMenu so additional setters can be called.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/SubMenu#setIcon(int)" title="Reference documentation">Java documentation for <code>android.view.SubMenu.setIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/SubMenu#setIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.view.SubMenu.setIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ISurfaceHolder.xml b/docs/Mono.Android/en/Android.Views/ISurfaceHolder.xml
index dbaea280d6..bdfca4ffed 100644
--- a/docs/Mono.Android/en/Android.Views/ISurfaceHolder.xml
+++ b/docs/Mono.Android/en/Android.Views/ISurfaceHolder.xml
@@ -172,12 +172,12 @@
       </Parameters>
       <Docs>
         <param name="dirty">Area of the Surface that will be modified.</param>
-        <summary>Start editing the pixels in the surface.</summary>
+        <summary>Just like <c>#lockCanvas()</c> but allows specification of a dirty rectangle.</summary>
         <returns>Canvas Use to draw into the surface.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/SurfaceHolder#lockCanvas()" title="Reference documentation">Java documentation for <code>android.view.SurfaceHolder.lockCanvas()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/SurfaceHolder#lockCanvas(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.SurfaceHolder.lockCanvas(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/IViewParent.xml b/docs/Mono.Android/en/Android.Views/IViewParent.xml
index 9457c9e8b3..ac58ba27e3 100644
--- a/docs/Mono.Android/en/Android.Views/IViewParent.xml
+++ b/docs/Mono.Android/en/Android.Views/IViewParent.xml
@@ -1716,18 +1716,23 @@
         <Parameter Name="y" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <param name="y">To be added.</param>
         <param name="originalView">the source view where the context menu was first
                                 invoked</param>
-        <summary>Shows the context menu for the specified view or its ancestors.</summary>
+        <param name="x">the X coordinate in pixels relative to the original view to
+                     which the menu should be anchored, or <c>Float#NaN</c> to
+                     disable anchoring</param>
+        <param name="y">the Y coordinate in pixels relative to the original view to
+                     which the menu should be anchored, or <c>Float#NaN</c> to
+                     disable anchoring</param>
+        <summary>Shows the context menu for the specified view or its ancestors anchored
+            to the specified view-relative coordinate.</summary>
         <returns>
           <c>true</c> if the context menu was shown, <c>false</c>
                     otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ViewParent#showContextMenuForChild(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.ViewParent.showContextMenuForChild(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ViewParent#showContextMenuForChild(android.view.View,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.view.ViewParent.showContextMenuForChild(android.view.View, float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1815,9 +1820,9 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
         <param name="originalView">The source view where the action mode was first invoked</param>
         <param name="callback">The callback that will handle lifecycle events for the action mode</param>
+        <param name="type">To be added.</param>
         <summary>Start an action mode for the specified view with the default type
             <c>ActionMode#TYPE_PRIMARY</c>.</summary>
         <returns>The new action mode if it was started, null otherwise</returns>
diff --git a/docs/Mono.Android/en/Android.Views/IWindowManager.xml b/docs/Mono.Android/en/Android.Views/IWindowManager.xml
index 00a48d46bb..4e99b72784 100644
--- a/docs/Mono.Android/en/Android.Views/IWindowManager.xml
+++ b/docs/Mono.Android/en/Android.Views/IWindowManager.xml
@@ -67,8 +67,6 @@
         <Parameter Name="listener" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="executor">
-          <c>Executor</c> to handle the listener callback</param>
         <param name="listener">the listener to be added. It will be called back with a boolean parameter,
                             which is true if cross-window blur is enabled and false if it is disabled</param>
         <summary>Adds a listener, which will be called when cross-window blurs are enabled/disabled at
@@ -76,7 +74,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/WindowManager#addCrossWindowBlurEnabledListener(java.util.concurrent.Executor,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.view.WindowManager.addCrossWindowBlurEnabledListener(java.util.concurrent.Executor, java.util.function.Consumer)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/WindowManager#addCrossWindowBlurEnabledListener(java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>android.view.WindowManager.addCrossWindowBlurEnabledListener(java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/InputDevice.xml b/docs/Mono.Android/en/Android.Views/InputDevice.xml
index c2e49433dd..d709b7a738 100644
--- a/docs/Mono.Android/en/Android.Views/InputDevice.xml
+++ b/docs/Mono.Android/en/Android.Views/InputDevice.xml
@@ -415,8 +415,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="source">The source for which to return information.</param>
         <param name="axis">The axis constant.</param>
+        <param name="source">The source for which to return information.</param>
         <summary>Gets information about the range of values for a particular <c>MotionEvent</c> axis.</summary>
         <returns>The range of values, or null if the requested axis is not
             supported by the device.</returns>
@@ -472,7 +472,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/InputDevice#hasKeys(int)" title="Reference documentation">Java documentation for <code>android.view.InputDevice.hasKeys(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/InputDevice#hasKeys(int[])" title="Reference documentation">Java documentation for <code>android.view.InputDevice.hasKeys(int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/KeyEvent.xml b/docs/Mono.Android/en/Android.Views/KeyEvent.xml
index c427a0c753..c83c52d5fd 100644
--- a/docs/Mono.Android/en/Android.Views/KeyEvent.xml
+++ b/docs/Mono.Android/en/Android.Views/KeyEvent.xml
@@ -68,14 +68,11 @@
       </Parameters>
       <Docs>
         <param name="origEvent">To be added.</param>
-        <param name="action">Action code: either <c>#ACTION_DOWN</c>,
-            <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
-        <param name="code">The key code.</param>
-        <summary>Create a new key event.</summary>
+        <summary>Make an exact copy of an existing key event.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(android.view.KeyEvent)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(android.view.KeyEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -190,17 +187,15 @@
         <Parameter Name="newRepeat" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="origEvent">To be added.</param>
-        <param name="eventTime">To be added.</param>
-        <param name="newRepeat">To be added.</param>
-        <param name="action">Action code: either <c>#ACTION_DOWN</c>,
-            <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
-        <param name="code">The key code.</param>
-        <summary>Create a new key event.</summary>
+        <param name="origEvent">The existing event to be copied.</param>
+        <param name="eventTime">The new event time
+            (in <c>android.os.SystemClock#uptimeMillis</c>) of the event.</param>
+        <param name="newRepeat">The new repeat count of the event.</param>
+        <summary>Copy an existing key event, modifying its time and repeat count.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(android.view.KeyEvent,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(android.view.KeyEvent, long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -242,18 +237,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
-        <param name="characters">To be added.</param>
-        <param name="deviceId">To be added.</param>
-        <param name="flags">To be added.</param>
-        <param name="action">Action code: either <c>#ACTION_DOWN</c>,
-            <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
-        <param name="code">The key code.</param>
-        <summary>Create a new key event.</summary>
+        <param name="time">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this event occured.</param>
+        <param name="characters">The string of characters.</param>
+        <param name="deviceId">The device ID that generated the key event.</param>
+        <param name="flags">The flags for this key event</param>
+        <summary>Create a new key event for a string of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(long,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(long, java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -303,17 +296,20 @@
         <Parameter Name="repeat" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="downTime">To be added.</param>
-        <param name="eventTime">To be added.</param>
-        <param name="repeat">To be added.</param>
+        <param name="downTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this key code originally went down.</param>
+        <param name="eventTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this event happened.</param>
         <param name="action">Action code: either <c>#ACTION_DOWN</c>,
             <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
         <param name="code">The key code.</param>
+        <param name="repeat">A repeat count for down events (&gt; 0 if this is after the
+            initial down) or event count for multiple events.</param>
         <summary>Create a new key event.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(long,%20long,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(long, long, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -371,18 +367,21 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="downTime">To be added.</param>
-        <param name="eventTime">To be added.</param>
-        <param name="repeat">To be added.</param>
-        <param name="metaState">To be added.</param>
+        <param name="downTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this key code originally went down.</param>
+        <param name="eventTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this event happened.</param>
         <param name="action">Action code: either <c>#ACTION_DOWN</c>,
             <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
         <param name="code">The key code.</param>
+        <param name="repeat">A repeat count for down events (&gt; 0 if this is after the
+            initial down) or event count for multiple events.</param>
+        <param name="metaState">Flags indicating which meta keys are currently pressed.</param>
         <summary>Create a new key event.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(long,%20long,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(long, long, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -442,20 +441,23 @@
         <Parameter Name="scancode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="downTime">To be added.</param>
-        <param name="eventTime">To be added.</param>
-        <param name="repeat">To be added.</param>
-        <param name="metaState">To be added.</param>
-        <param name="deviceId">To be added.</param>
-        <param name="scancode">To be added.</param>
+        <param name="downTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this key code originally went down.</param>
+        <param name="eventTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this event happened.</param>
         <param name="action">Action code: either <c>#ACTION_DOWN</c>,
             <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
         <param name="code">The key code.</param>
+        <param name="repeat">A repeat count for down events (&gt; 0 if this is after the
+            initial down) or event count for multiple events.</param>
+        <param name="metaState">Flags indicating which meta keys are currently pressed.</param>
+        <param name="deviceId">The device ID that generated the key event.</param>
+        <param name="scancode">Raw device scan code of the event.</param>
         <summary>Create a new key event.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(long,%20long,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(long, long, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -523,21 +525,24 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="downTime">To be added.</param>
-        <param name="eventTime">To be added.</param>
-        <param name="repeat">To be added.</param>
-        <param name="metaState">To be added.</param>
-        <param name="deviceId">To be added.</param>
-        <param name="scancode">To be added.</param>
-        <param name="flags">To be added.</param>
+        <param name="downTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this key code originally went down.</param>
+        <param name="eventTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this event happened.</param>
         <param name="action">Action code: either <c>#ACTION_DOWN</c>,
             <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
         <param name="code">The key code.</param>
+        <param name="repeat">A repeat count for down events (&gt; 0 if this is after the
+            initial down) or event count for multiple events.</param>
+        <param name="metaState">Flags indicating which meta keys are currently pressed.</param>
+        <param name="deviceId">The device ID that generated the key event.</param>
+        <param name="scancode">Raw device scan code of the event.</param>
+        <param name="flags">The flags for this key event</param>
         <summary>Create a new key event.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(long,%20long,%20int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(long, long, int, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -613,22 +618,25 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="downTime">To be added.</param>
-        <param name="eventTime">To be added.</param>
-        <param name="repeat">To be added.</param>
-        <param name="metaState">To be added.</param>
-        <param name="deviceId">To be added.</param>
-        <param name="scancode">To be added.</param>
-        <param name="flags">To be added.</param>
-        <param name="source">To be added.</param>
+        <param name="downTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this key code originally went down.</param>
+        <param name="eventTime">The time (in <c>android.os.SystemClock#uptimeMillis</c>)
+            at which this event happened.</param>
         <param name="action">Action code: either <c>#ACTION_DOWN</c>,
             <c>#ACTION_UP</c>, or <c>#ACTION_MULTIPLE</c>.</param>
         <param name="code">The key code.</param>
+        <param name="repeat">A repeat count for down events (&gt; 0 if this is after the
+            initial down) or event count for multiple events.</param>
+        <param name="metaState">Flags indicating which meta keys are currently pressed.</param>
+        <param name="deviceId">The device ID that generated the key event.</param>
+        <param name="scancode">Raw device scan code of the event.</param>
+        <param name="flags">The flags for this key event</param>
+        <param name="source">The input source such as <c>InputDevice#SOURCE_KEYBOARD</c>.</param>
         <summary>Create a new key event.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(long,%20long,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.KeyEvent(long, long, int, int, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -863,20 +871,19 @@
       </Parameters>
       <Docs>
         <param name="e">The existing event to be copied.  This is not modified.</param>
-        <param name="newFlags">New flags for the event, replacing the entire value
- in the original event.
-</param>
         <param name="event">The existing event to be copied.  This is not modified.</param>
         <param name="eventTime">The new event time
             (in <c>android.os.SystemClock#uptimeMillis</c>) of the event.</param>
         <param name="newRepeat">The new repeat count of the event.</param>
+        <param name="newFlags">New flags for the event, replacing the entire value
+            in the original event.</param>
         <summary>Create a new key event that is the same as the given one, but whose
             event time and repeat count are replaced with the given value.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#changeTimeRepeat(android.view.KeyEvent,%20long,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.changeTimeRepeat(android.view.KeyEvent, long, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#changeTimeRepeat(android.view.KeyEvent,%20long,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.changeTimeRepeat(android.view.KeyEvent, long, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1404,15 +1411,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="metaState">The preferred meta key modifier state.</param>
         <param name="chars">The array of matching characters to consider.</param>
+        <param name="metaState">The preferred meta key modifier state.</param>
         <summary>Gets the first character in the character array that can be generated
             by the specified key code.</summary>
         <returns>The matching associated character, or 0 if none.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#getMatch(char[])" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.getMatch(char[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#getMatch(char[],%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.getMatch(char[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1494,7 +1501,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyEvent#getUnicodeChar()" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.getUnicodeChar()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyEvent#getUnicodeChar(int)" title="Reference documentation">Java documentation for <code>android.view.KeyEvent.getUnicodeChar(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup.xml b/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup.xml
index 1a0bf665d5..13018c43ac 100644
--- a/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup.xml
+++ b/docs/Mono.Android/en/Android.Views/KeyboardShortcutGroup.xml
@@ -130,13 +130,13 @@
         <Parameter Name="items" Type="System.Collections.Generic.IList&lt;Android.Views.KeyboardShortcutInfo&gt;" />
       </Parameters>
       <Docs>
-        <param name="items">To be added.</param>
         <param name="label">The title to be used for this group, or null if there is none.</param>
+        <param name="items">The set of items to be included.</param>
         <summary>To be added.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup#KeyboardShortcutGroup(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.KeyboardShortcutGroup.KeyboardShortcutGroup(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup#KeyboardShortcutGroup(java.lang.CharSequence,%20java.util.List)" title="Reference documentation">Java documentation for <code>android.view.KeyboardShortcutGroup.KeyboardShortcutGroup(java.lang.CharSequence, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo.xml b/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo.xml
index 768613e10a..631dcb98c9 100644
--- a/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo.xml
+++ b/docs/Mono.Android/en/Android.Views/KeyboardShortcutInfo.xml
@@ -82,9 +82,9 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="keycode">To be added.</param>
         <param name="label">The label that identifies the action performed by this shortcut.</param>
-        <param name="baseCharacter">The character that triggers the shortcut.</param>
+        <param name="keycode">The keycode that triggers the shortcut. This should be a valid constant
+                defined in <c>KeyEvent</c>.</param>
         <param name="modifiers">The set of modifiers that, combined with the key, trigger the shortcut.
                 These should be a combination of <c>KeyEvent#META_CTRL_ON</c>,
                 <c>KeyEvent#META_SHIFT_ON</c>, <c>KeyEvent#META_META_ON</c>,
@@ -94,7 +94,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo#KeyboardShortcutInfo(java.lang.CharSequence,%20char,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyboardShortcutInfo.KeyboardShortcutInfo(java.lang.CharSequence, char, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo#KeyboardShortcutInfo(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.KeyboardShortcutInfo.KeyboardShortcutInfo(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/LayoutInflater.xml b/docs/Mono.Android/en/Android.Views/LayoutInflater.xml
index 81cb9c8590..9acc7f1f11 100644
--- a/docs/Mono.Android/en/Android.Views/LayoutInflater.xml
+++ b/docs/Mono.Android/en/Android.Views/LayoutInflater.xml
@@ -95,16 +95,14 @@
         <Parameter Name="newContext" Type="Android.Content.Context" />
       </Parameters>
       <Docs>
-        <param name="original">To be added.</param>
-        <param name="newContext">To be added.</param>
-        <param name="context">The Context in which this LayoutInflater will create its
-            Views; most importantly, this supplies the theme from which the default
-            values for their attributes are retrieved.</param>
-        <summary>Create a new LayoutInflater instance associated with a particular Context.</summary>
+        <param name="original">The original LayoutInflater to copy.</param>
+        <param name="newContext">The new Context to use.</param>
+        <summary>Create a new LayoutInflater instance that is a copy of an existing
+            LayoutInflater, optionally with its Context changed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/LayoutInflater#LayoutInflater(android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.LayoutInflater(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/LayoutInflater#LayoutInflater(android.view.LayoutInflater,%20android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.LayoutInflater(android.view.LayoutInflater, android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -247,7 +245,6 @@
       </Parameters>
       <Docs>
         <param name="prefix">To be added.</param>
-        <param name="viewContext">The context used as the context parameter of the View constructor</param>
         <param name="name">The full name of the class to be instantiated.</param>
         <param name="attrs">The XML attributes supplied for this instance.</param>
         <summary>Low-level function for instantiating a view by name.</summary>
@@ -255,7 +252,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/LayoutInflater#createView(android.content.Context,%20java.lang.String,%20java.lang.String,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.createView(android.content.Context, java.lang.String, java.lang.String, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/LayoutInflater#createView(java.lang.String,%20java.lang.String,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.createView(java.lang.String, java.lang.String, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -437,8 +434,6 @@
         <ReturnType>Android.Views.LayoutInflater+IFilter</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="filter">The Filter which restricts the set of Views that are allowed to be inflated.
-                   This filter will replace any previous filter set on this LayoutInflater.</param>
         <summary>Sets the <c>Filter</c> to by this LayoutInflater.</summary>
         <value>The <c>Filter</c> currently used by this LayoutInflater to restrict the set of Views
             that are allowed to be inflated.</value>
@@ -601,18 +596,16 @@
       </Parameters>
       <Docs>
         <param name="parser">XML dom node containing the description of the view
-        hierarchy.</param>
-        <param name="resource">ID for an XML layout resource to load (e.g.,
-                   &lt;code&gt;R.layout.main_page&lt;/code&gt;)</param>
+                   hierarchy.</param>
         <param name="root">Optional view to be the parent of the generated hierarchy.</param>
-        <summary>Inflate a new view hierarchy from the specified xml resource.</summary>
+        <summary>Inflate a new view hierarchy from the specified xml node.</summary>
         <returns>The root View of the inflated hierarchy. If root was supplied,
                     this is the root View; otherwise it is the root of the inflated
                     XML file.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/LayoutInflater#inflate(int,%20android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.inflate(int, android.view.ViewGroup)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/LayoutInflater#inflate(org.xmlpull.v1.XmlPullParser,%20android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.inflate(org.xmlpull.v1.XmlPullParser, android.view.ViewGroup)</code>.</a>
             </format>
           </para>
           <para>
@@ -649,20 +642,23 @@
         <Parameter Name="attachToRoot" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="attachToRoot">Whether the inflated hierarchy should be attached to
-        the root parameter? If false, root is only used to create the
-        correct subclass of LayoutParams for the root view in the XML.</param>
         <param name="resource">ID for an XML layout resource to load (e.g.,
                    &lt;code&gt;R.layout.main_page&lt;/code&gt;)</param>
-        <param name="root">Optional view to be the parent of the generated hierarchy.</param>
+        <param name="root">Optional view to be the parent of the generated hierarchy (if
+                   &lt;em&gt;attachToRoot&lt;/em&gt; is true), or else simply an object that
+                   provides a set of LayoutParams values for root of the returned
+                   hierarchy (if &lt;em&gt;attachToRoot&lt;/em&gt; is false.)</param>
+        <param name="attachToRoot">Whether the inflated hierarchy should be attached to
+                   the root parameter? If false, root is only used to create the
+                   correct subclass of LayoutParams for the root view in the XML.</param>
         <summary>Inflate a new view hierarchy from the specified xml resource.</summary>
-        <returns>The root View of the inflated hierarchy. If root was supplied,
-                    this is the root View; otherwise it is the root of the inflated
-                    XML file.</returns>
+        <returns>The root View of the inflated hierarchy. If root was supplied and
+                    attachToRoot is true, this is root; otherwise it is the root of
+                    the inflated XML file.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/LayoutInflater#inflate(int,%20android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.inflate(int, android.view.ViewGroup)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/LayoutInflater#inflate(int,%20android.view.ViewGroup,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.inflate(int, android.view.ViewGroup, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -700,21 +696,22 @@
       </Parameters>
       <Docs>
         <param name="parser">XML dom node containing the description of the view
-        hierarchy.</param>
+                   hierarchy.</param>
+        <param name="root">Optional view to be the parent of the generated hierarchy (if
+                   &lt;em&gt;attachToRoot&lt;/em&gt; is true), or else simply an object that
+                   provides a set of LayoutParams values for root of the returned
+                   hierarchy (if &lt;em&gt;attachToRoot&lt;/em&gt; is false.)</param>
         <param name="attachToRoot">Whether the inflated hierarchy should be attached to
-        the root parameter? If false, root is only used to create the
-        correct subclass of LayoutParams for the root view in the XML.</param>
-        <param name="resource">ID for an XML layout resource to load (e.g.,
-                   &lt;code&gt;R.layout.main_page&lt;/code&gt;)</param>
-        <param name="root">Optional view to be the parent of the generated hierarchy.</param>
-        <summary>Inflate a new view hierarchy from the specified xml resource.</summary>
-        <returns>The root View of the inflated hierarchy. If root was supplied,
-                    this is the root View; otherwise it is the root of the inflated
-                    XML file.</returns>
+                   the root parameter? If false, root is only used to create the
+                   correct subclass of LayoutParams for the root view in the XML.</param>
+        <summary>Inflate a new view hierarchy from the specified XML node.</summary>
+        <returns>The root View of the inflated hierarchy. If root was supplied and
+                    attachToRoot is true, this is root; otherwise it is the root of
+                    the inflated XML file.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/LayoutInflater#inflate(int,%20android.view.ViewGroup)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.inflate(int, android.view.ViewGroup)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/LayoutInflater#inflate(org.xmlpull.v1.XmlPullParser,%20android.view.ViewGroup,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.inflate(org.xmlpull.v1.XmlPullParser, android.view.ViewGroup, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -781,18 +778,15 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="viewContext">The Context to be used as a constructor parameter for the View</param>
-        <param name="parent">The future parent of the returned view.  &lt;em&gt;Note that
-            this may be null.&lt;/em&gt;</param>
         <param name="name">The fully qualified class name of the View to be create.</param>
         <param name="attrs">An AttributeSet of attributes to apply to the View.</param>
-        <summary>Version of <c>#onCreateView(View, String, AttributeSet)</c> that also
-            takes the inflation context.</summary>
+        <summary>This routine is responsible for creating the correct subclass of View
+            given the xml element name.</summary>
         <returns>View The View created.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/LayoutInflater#onCreateView(android.content.Context,%20android.view.View,%20java.lang.String,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.onCreateView(android.content.Context, android.view.View, java.lang.String, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/LayoutInflater#onCreateView(java.lang.String,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.onCreateView(java.lang.String, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -830,18 +824,17 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="viewContext">The Context to be used as a constructor parameter for the View</param>
         <param name="parent">The future parent of the returned view.  &lt;em&gt;Note that
             this may be null.&lt;/em&gt;</param>
         <param name="name">The fully qualified class name of the View to be create.</param>
         <param name="attrs">An AttributeSet of attributes to apply to the View.</param>
-        <summary>Version of <c>#onCreateView(View, String, AttributeSet)</c> that also
-            takes the inflation context.</summary>
+        <summary>Version of <c>#onCreateView(String, AttributeSet)</c> that also
+            takes the future parent of the view being constructed.</summary>
         <returns>View The View created.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/LayoutInflater#onCreateView(android.content.Context,%20android.view.View,%20java.lang.String,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.onCreateView(android.content.Context, android.view.View, java.lang.String, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/LayoutInflater#onCreateView(android.view.View,%20java.lang.String,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.LayoutInflater.onCreateView(android.view.View, java.lang.String, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/MotionEvent.xml b/docs/Mono.Android/en/Android.Views/MotionEvent.xml
index 20213bc2e4..9651658bd0 100644
--- a/docs/Mono.Android/en/Android.Views/MotionEvent.xml
+++ b/docs/Mono.Android/en/Android.Views/MotionEvent.xml
@@ -291,12 +291,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="pointerCoords">The new pointer coordinates.</param>
         <param name="eventTime">The time stamp (in ms) for this data.</param>
-        <param name="x">The new X position.</param>
-        <param name="y">The new Y position.</param>
-        <param name="pressure">The new pressure.</param>
-        <param name="size">The new size.</param>
+        <param name="pointerCoords">The new pointer coordinates.</param>
         <param name="metaState">Meta key state.</param>
         <summary>Add a new movement to the batch of movements in this event.</summary>
         <remarks>
@@ -1434,17 +1430,16 @@
         <Parameter Name="pointerIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
         <param name="axis">The axis identifier for the axis value to retrieve.</param>
-        <summary>
-          <c>#getAxisValue(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
-        <returns>To be added.</returns>
+        <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the value of the requested axis for the given pointer &lt;em&gt;index&lt;/em&gt;
+            (use <c>#getPointerId(int)</c> to find the pointer identifier for this index).</summary>
+        <returns>The value of the axis, or 0 if the axis is not available.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getAxisValue(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getAxisValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getAxisValue(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getAxisValue(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1543,19 +1538,18 @@
         <Parameter Name="pos" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
         <param name="axis">The axis identifier for the axis value to retrieve.</param>
+        <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalAxisValue(int, int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
-        <returns>To be added.</returns>
+        <summary>Returns the historical value of the requested axis, as per <c>#getAxisValue(int, int)</c>,
+            occurred between this event and the previous event for the given pointer.</summary>
+        <returns>The value of the axis, or 0 if the axis is not available.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalAxisValue(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalAxisValue(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalAxisValue(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalAxisValue(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1685,17 +1679,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalOrientation(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical orientation coordinate, as per <c>#getOrientation(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalOrientation(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalOrientation(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalOrientation(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalOrientation(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1830,17 +1823,17 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalPressure(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical pressure coordinate, as per <c>#getPressure(int)</c>,
+            that occurred between this event and the previous event for the given
+            pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalPressure(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalPressure(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalPressure(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalPressure(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1925,17 +1918,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalSize(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical size coordinate, as per <c>#getSize(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalSize(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalSize(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalSize(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalSize(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2020,17 +2012,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalToolMajor(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical tool major axis coordinate, as per <c>#getToolMajor(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalToolMajor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalToolMajor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalToolMajor(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalToolMajor(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2115,17 +2106,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalToolMinor(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical tool minor axis coordinate, as per <c>#getToolMinor(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalToolMinor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalToolMinor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalToolMinor(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalToolMinor(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2210,17 +2200,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalTouchMajor(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical touch major axis coordinate, as per <c>#getTouchMajor(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalTouchMajor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalTouchMajor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalTouchMajor(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalTouchMajor(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2305,17 +2294,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalTouchMinor(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical touch minor axis coordinate, as per <c>#getTouchMinor(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalTouchMinor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalTouchMinor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalTouchMinor(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalTouchMinor(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2400,17 +2388,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalX(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical X coordinate, as per <c>#getX(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalX(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalX(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalX(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalX(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2495,17 +2482,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <param name="pos">Which historical value to return; must be less than
             <c>#getHistorySize</c></param>
-        <summary>
-          <c>#getHistoricalY(int, int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+        <summary>Returns a historical Y coordinate, as per <c>#getY(int)</c>, that
+            occurred between this event and the previous event for the given pointer.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalY(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalY(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getHistoricalY(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getHistoricalY(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2543,15 +2529,15 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getOrientation(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the orientation of the touch area and tool area in radians clockwise from vertical
+            for the given pointer &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getOrientation()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getOrientation()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getOrientation(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getOrientation(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2718,15 +2704,15 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getPressure(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the current pressure of this event for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getPressure()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getPressure()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getPressure(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getPressure(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2761,13 +2747,14 @@
         <Parameter Name="pointerIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pointerIndex">To be added.</param>
+        <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <summary>Returns the original raw X coordinate of this event.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getRawX()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getRawX()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getRawX(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getRawX(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2801,13 +2788,14 @@
         <Parameter Name="pointerIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pointerIndex">To be added.</param>
+        <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
         <summary>Returns the original raw Y coordinate of this event.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getRawY()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getRawY()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getRawY(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getRawY(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2842,15 +2830,15 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getSize(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns a scaled value of the approximate size for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getSize()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getSize()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getSize(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getSize(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2886,15 +2874,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getToolMajor(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the length of the major axis of an ellipse that describes the size of
+            the approaching tool for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getToolMajor()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getToolMajor()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getToolMajor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getToolMajor(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2930,15 +2919,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getToolMinor(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the length of the minor axis of an ellipse that describes the size of
+            the approaching tool for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getToolMinor()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getToolMinor()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getToolMinor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getToolMinor(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3026,15 +3016,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getTouchMajor(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the length of the major axis of an ellipse that describes the touch
+            area at the point of contact for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getTouchMajor()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getTouchMajor()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getTouchMajor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getTouchMajor(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3070,15 +3061,16 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getTouchMinor(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the length of the minor axis of an ellipse that describes the touch
+            area at the point of contact for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getTouchMinor()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getTouchMinor()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getTouchMinor(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getTouchMinor(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3154,15 +3146,15 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getX(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the X coordinate of this event for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getX()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getX()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getX(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getX(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3238,15 +3230,15 @@
       </Parameters>
       <Docs>
         <param name="pointerIndex">Raw index of pointer to retrieve.  Value may be from 0
- (the first pointer that is down) to <see cref="P:Android.Views.MotionEvent.PointerCount" />-1.</param>
-        <summary>
-          <c>#getY(int)</c> for the first pointer index (may be an
-            arbitrary pointer identifier).</summary>
+            (the first pointer that is down) to <c>#getPointerCount()</c>-1.</param>
+        <summary>Returns the Y coordinate of this event for the given pointer
+            &lt;em&gt;index&lt;/em&gt; (use <c>#getPointerId(int)</c> to find the pointer
+            identifier for this index).</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#getY()" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getY()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#getY(int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.getY(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3487,37 +3479,12 @@
       </Parameters>
       <Docs>
         <param name="other">To be added.</param>
-        <param name="downTime">The time (in ms) when the user originally pressed down to start
-            a stream of position events.  This must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
-        <param name="eventTime">The the time (in ms) when this specific event was generated.  This
-            must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
-        <param name="action">The kind of action being performed, such as <c>#ACTION_DOWN</c>.</param>
-        <param name="x">The X coordinate of this event.</param>
-        <param name="y">The Y coordinate of this event.</param>
-        <param name="pressure">The current pressure of this event.  The pressure generally
-            ranges from 0 (no pressure at all) to 1 (normal pressure), however
-            values higher than 1 may be generated depending on the calibration of
-            the input device.</param>
-        <param name="size">A scaled value of the approximate size of the area being pressed when
-            touched with the finger. The actual value in pixels corresponding to the finger
-            touch is normalized with a device specific range of values
-            and scaled to a value between 0 and 1.</param>
-        <param name="metaState">The state of any meta / modifier keys that were in effect when
-            the event was generated.</param>
-        <param name="xPrecision">The precision of the X coordinate being reported.</param>
-        <param name="yPrecision">The precision of the Y coordinate being reported.</param>
-        <param name="deviceId">The id for the device that this event came from.  An id of
-            zero indicates that the event didn't come from a physical device; other
-            numbers are arbitrary and you shouldn't depend on the values.</param>
-        <param name="edgeFlags">A bitfield indicating which edges, if any, were touched by this
-            MotionEvent.</param>
-        <summary>Create a new MotionEvent, filling in all of the basic values that
-            define the motion.</summary>
+        <summary>Create a new MotionEvent, copying from an existing one.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#obtain(long,%20long,%20int,%20float,%20float,%20float,%20float,%20int,%20float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.obtain(long, long, int, float, float, float, float, int, float, float, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#obtain(android.view.MotionEvent)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.obtain(android.view.MotionEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -3578,30 +3545,15 @@
         <param name="action">The kind of action being performed, such as <c>#ACTION_DOWN</c>.</param>
         <param name="x">The X coordinate of this event.</param>
         <param name="y">The Y coordinate of this event.</param>
-        <param name="pressure">The current pressure of this event.  The pressure generally
-            ranges from 0 (no pressure at all) to 1 (normal pressure), however
-            values higher than 1 may be generated depending on the calibration of
-            the input device.</param>
-        <param name="size">A scaled value of the approximate size of the area being pressed when
-            touched with the finger. The actual value in pixels corresponding to the finger
-            touch is normalized with a device specific range of values
-            and scaled to a value between 0 and 1.</param>
         <param name="metaState">The state of any meta / modifier keys that were in effect when
             the event was generated.</param>
-        <param name="xPrecision">The precision of the X coordinate being reported.</param>
-        <param name="yPrecision">The precision of the Y coordinate being reported.</param>
-        <param name="deviceId">The id for the device that this event came from.  An id of
-            zero indicates that the event didn't come from a physical device; other
-            numbers are arbitrary and you shouldn't depend on the values.</param>
-        <param name="edgeFlags">A bitfield indicating which edges, if any, were touched by this
-            MotionEvent.</param>
-        <summary>Create a new MotionEvent, filling in all of the basic values that
-            define the motion.</summary>
+        <summary>Create a new MotionEvent, filling in a subset of the basic motion
+            values.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#obtain(long,%20long,%20int,%20float,%20float,%20float,%20float,%20int,%20float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.obtain(long, long, int, float, float, float, float, int, float, float, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#obtain(long,%20long,%20int,%20float,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.obtain(long, long, int, float, float, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3866,28 +3818,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="pointerCount">The number of pointers that will be in this event.</param>
-        <param name="pointerIds">An array of <i>pointerCount</i> values providing
- an identifier for each pointer.</param>
-        <param name="pointerCoords">An array of <i>pointerCount</i> values providing
- a <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=MotionEvent PointerCoords ;scope=Xamarin" title="MotionEvent PointerCoords ">MotionEvent PointerCoords </a></format> coordinate object for each pointer.</param>
-        <param name="source">The source of this event.</param>
-        <param name="flags">The motion event flags.</param>
         <param name="downTime">The time (in ms) when the user originally pressed down to start
             a stream of position events.  This must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
         <param name="eventTime">The the time (in ms) when this specific event was generated.  This
             must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
         <param name="action">The kind of action being performed, such as <c>#ACTION_DOWN</c>.</param>
-        <param name="x">The X coordinate of this event.</param>
-        <param name="y">The Y coordinate of this event.</param>
-        <param name="pressure">The current pressure of this event.  The pressure generally
-            ranges from 0 (no pressure at all) to 1 (normal pressure), however
-            values higher than 1 may be generated depending on the calibration of
-            the input device.</param>
-        <param name="size">A scaled value of the approximate size of the area being pressed when
-            touched with the finger. The actual value in pixels corresponding to the finger
-            touch is normalized with a device specific range of values
-            and scaled to a value between 0 and 1.</param>
+        <param name="pointerCount">The number of pointers that will be in this event.</param>
+        <param name="pointerIds">An array of <i>pointerCount</i> values providing
+ an identifier for each pointer.</param>
+        <param name="pointerCoords">An array of <i>pointerCount</i> values providing
+ a <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=MotionEvent PointerCoords ;scope=Xamarin" title="MotionEvent PointerCoords ">MotionEvent PointerCoords </a></format> coordinate object for each pointer.</param>
         <param name="metaState">The state of any meta / modifier keys that were in effect when
             the event was generated.</param>
         <param name="xPrecision">The precision of the X coordinate being reported.</param>
@@ -3897,6 +3837,8 @@
             numbers are arbitrary and you shouldn't depend on the values.</param>
         <param name="edgeFlags">A bitfield indicating which edges, if any, were touched by this
             MotionEvent.</param>
+        <param name="source">The source of this event.</param>
+        <param name="flags">The motion event flags.</param>
         <summary>Create a new MotionEvent, filling in all of the basic values that
             define the motion.</summary>
         <returns>To be added.</returns>
@@ -3975,12 +3917,12 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="pointerCount">The number of pointers that are active in this event.</param>
         <param name="downTime">The time (in ms) when the user originally pressed down to start
             a stream of position events.  This must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
         <param name="eventTime">The the time (in ms) when this specific event was generated.  This
             must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
         <param name="action">The kind of action being performed, such as <c>#ACTION_DOWN</c>.</param>
+        <param name="pointerCount">The number of pointers that are active in this event.</param>
         <param name="x">The X coordinate of this event.</param>
         <param name="y">The Y coordinate of this event.</param>
         <param name="pressure">The current pressure of this event.  The pressure generally
@@ -4006,7 +3948,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/MotionEvent#obtain(long,%20long,%20int,%20float,%20float,%20float,%20float,%20int,%20float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.obtain(long, long, int, float, float, float, float, int, float, float, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/MotionEvent#obtain(long,%20long,%20int,%20int,%20float,%20float,%20float,%20float,%20int,%20float,%20float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.MotionEvent.obtain(long, long, int, int, float, float, float, float, int, float, float, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4194,33 +4136,20 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="downTime">The time (in ms) when the user originally pressed down to start
+            a stream of position events.  This must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
+        <param name="eventTime">The the time (in ms) when this specific event was generated.  This
+            must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
+        <param name="action">The kind of action being performed, such as <c>#ACTION_DOWN</c>.</param>
         <param name="pointerCount">The number of pointers that will be in this event.</param>
         <param name="pointerProperties">An array of <i>pointerCount</i> values providing
  a <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=MotionEvent PointerProperties ;scope=Xamarin" title="MotionEvent PointerProperties ">MotionEvent PointerProperties </a></format> property object for each pointer, which must
  include the pointer identifier.</param>
         <param name="pointerCoords">An array of <i>pointerCount</i> values providing
  a <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=MotionEvent PointerCoords ;scope=Xamarin" title="MotionEvent PointerCoords ">MotionEvent PointerCoords </a></format> coordinate object for each pointer.</param>
-        <param name="buttonState">The state of buttons that are pressed.</param>
-        <param name="source">The source of this event.</param>
-        <param name="flags">The motion event flags.
-</param>
-        <param name="downTime">The time (in ms) when the user originally pressed down to start
-            a stream of position events.  This must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
-        <param name="eventTime">The the time (in ms) when this specific event was generated.  This
-            must be obtained from <c>SystemClock#uptimeMillis()</c>.</param>
-        <param name="action">The kind of action being performed, such as <c>#ACTION_DOWN</c>.</param>
-        <param name="x">The X coordinate of this event.</param>
-        <param name="y">The Y coordinate of this event.</param>
-        <param name="pressure">The current pressure of this event.  The pressure generally
-            ranges from 0 (no pressure at all) to 1 (normal pressure), however
-            values higher than 1 may be generated depending on the calibration of
-            the input device.</param>
-        <param name="size">A scaled value of the approximate size of the area being pressed when
-            touched with the finger. The actual value in pixels corresponding to the finger
-            touch is normalized with a device specific range of values
-            and scaled to a value between 0 and 1.</param>
         <param name="metaState">The state of any meta / modifier keys that were in effect when
             the event was generated.</param>
+        <param name="buttonState">The state of buttons that are pressed.</param>
         <param name="xPrecision">The precision of the X coordinate being reported.</param>
         <param name="yPrecision">The precision of the Y coordinate being reported.</param>
         <param name="deviceId">The id for the device that this event came from.  An id of
@@ -4228,6 +4157,9 @@
             numbers are arbitrary and you shouldn't depend on the values.</param>
         <param name="edgeFlags">A bitfield indicating which edges, if any, were touched by this
             MotionEvent.</param>
+        <param name="source">The source of this event.</param>
+        <param name="flags">The motion event flags.
+</param>
         <summary>Create a new MotionEvent, filling in all of the basic values that
             define the motion.</summary>
         <returns>To be added.</returns>
diff --git a/docs/Mono.Android/en/Android.Views/OrientationEventListener.xml b/docs/Mono.Android/en/Android.Views/OrientationEventListener.xml
index 51280da90d..350fceb57c 100644
--- a/docs/Mono.Android/en/Android.Views/OrientationEventListener.xml
+++ b/docs/Mono.Android/en/Android.Views/OrientationEventListener.xml
@@ -100,13 +100,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="rate">To be added.</param>
         <param name="context">for the OrientationEventListener.</param>
+        <param name="rate">at which sensor events are processed (see also
+            <c>android.hardware.SensorManager SensorManager</c>). Use the default
+            value of <c>android.hardware.SensorManager#SENSOR_DELAY_NORMAL 
+            SENSOR_DELAY_NORMAL</c> for simple screen orientation change detection.</param>
         <summary>Creates a new OrientationEventListener.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/OrientationEventListener#OrientationEventListener(android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.OrientationEventListener.OrientationEventListener(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/OrientationEventListener#OrientationEventListener(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.view.OrientationEventListener.OrientationEventListener(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/OrientationListener.xml b/docs/Mono.Android/en/Android.Views/OrientationListener.xml
index 560086f811..d25e936b34 100644
--- a/docs/Mono.Android/en/Android.Views/OrientationListener.xml
+++ b/docs/Mono.Android/en/Android.Views/OrientationListener.xml
@@ -125,13 +125,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="rate">To be added.</param>
         <param name="context">for the OrientationListener.</param>
+        <param name="rate">at which sensor events are processed (see also
+            <c>android.hardware.SensorManager SensorManager</c>). Use the default
+            value of <c>android.hardware.SensorManager#SENSOR_DELAY_NORMAL 
+            SENSOR_DELAY_NORMAL</c> for simple screen orientation change detection.</param>
         <summary>Creates a new OrientationListener.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/OrientationListener#OrientationListener(android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.OrientationListener.OrientationListener(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/OrientationListener#OrientationListener(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.view.OrientationListener.OrientationListener(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/PixelCopy.xml b/docs/Mono.Android/en/Android.Views/PixelCopy.xml
index 1e9b4abc33..a94d9977cc 100644
--- a/docs/Mono.Android/en/Android.Views/PixelCopy.xml
+++ b/docs/Mono.Android/en/Android.Views/PixelCopy.xml
@@ -437,8 +437,8 @@
         <Parameter Name="listenerThread" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="srcRect">To be added.</param>
         <param name="source">The source from which to copy</param>
+        <param name="srcRect">To be added.</param>
         <param name="dest">The destination of the copy. The source will be scaled to
             match the width, height, and format of this bitmap.</param>
         <param name="listener">Callback for when the pixel copy request completes</param>
@@ -487,8 +487,8 @@
         <Parameter Name="listenerThread" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="srcRect">To be added.</param>
         <param name="source">The source from which to copy</param>
+        <param name="srcRect">To be added.</param>
         <param name="dest">The destination of the copy. The source will be scaled to
             match the width, height, and format of this bitmap.</param>
         <param name="listener">Callback for when the pixel copy request completes</param>
@@ -537,8 +537,8 @@
         <Parameter Name="listenerThread" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="srcRect">To be added.</param>
         <param name="source">The source from which to copy</param>
+        <param name="srcRect">To be added.</param>
         <param name="dest">The destination of the copy. The source will be scaled to
             match the width, height, and format of this bitmap.</param>
         <param name="listener">Callback for when the pixel copy request completes</param>
diff --git a/docs/Mono.Android/en/Android.Views/PointerIcon.xml b/docs/Mono.Android/en/Android.Views/PointerIcon.xml
index 2d9862439e..378d3a5739 100644
--- a/docs/Mono.Android/en/Android.Views/PointerIcon.xml
+++ b/docs/Mono.Android/en/Android.Views/PointerIcon.xml
@@ -257,12 +257,21 @@
         <Parameter Name="resourceId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resources">To be added.</param>
-        <param name="resourceId">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="resources">The resources object.</param>
+        <param name="resourceId">The resource id.</param>
+        <summary>Loads a custom pointer icon from an XML resource.</summary>
+        <returns>The pointer icon.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/PointerIcon#load(android.content.res.Resources,%20int)" title="Reference documentation">Java documentation for <code>android.view.PointerIcon.load(android.content.res.Resources, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.Views/RoundedCorner.xml b/docs/Mono.Android/en/Android.Views/RoundedCorner.xml
index e53494bd9a..c4b68f49d5 100644
--- a/docs/Mono.Android/en/Android.Views/RoundedCorner.xml
+++ b/docs/Mono.Android/en/Android.Views/RoundedCorner.xml
@@ -76,12 +76,23 @@
         <Parameter Name="centerY" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="position">To be added.</param>
-        <param name="radius">To be added.</param>
-        <param name="centerX">To be added.</param>
-        <param name="centerY">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="position">the position of the rounded corner.</param>
+        <param name="radius">the radius of the rounded corner.</param>
+        <param name="centerX">the x of center point of the rounded corner.</param>
+        <param name="centerY">the y of center point of the rounded corner.</param>
+        <summary>Creates a <c>RoundedCorner</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/RoundedCorner#RoundedCorner(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.RoundedCorner.RoundedCorner(int, int, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Center">
diff --git a/docs/Mono.Android/en/Android.Views/ScaleGestureDetector.xml b/docs/Mono.Android/en/Android.Views/ScaleGestureDetector.xml
index 17975bcb7e..5621366c99 100644
--- a/docs/Mono.Android/en/Android.Views/ScaleGestureDetector.xml
+++ b/docs/Mono.Android/en/Android.Views/ScaleGestureDetector.xml
@@ -121,10 +121,10 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="context">the application's context</param>
         <param name="listener">the listener invoked for all the callbacks, this must
             not be null.</param>
+        <param name="handler">To be added.</param>
         <summary>Creates a ScaleGestureDetector with the supplied listener.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/Surface.xml b/docs/Mono.Android/en/Android.Views/Surface.xml
index aa484551e8..b8f9770915 100644
--- a/docs/Mono.Android/en/Android.Views/Surface.xml
+++ b/docs/Mono.Android/en/Android.Views/Surface.xml
@@ -67,10 +67,20 @@
         <Parameter Name="surfaceTexture" Type="Android.Graphics.SurfaceTexture" />
       </Parameters>
       <Docs>
-        <param name="surfaceTexture">To be added.</param>
-        <summary>Create Surface from a <see cref="T:Android.Graphics.SurfaceTexture" />.</summary>
+        <param name="surfaceTexture">The <c>SurfaceTexture</c> that is updated by this
+            Surface.</param>
+        <summary>Create Surface from a <c>SurfaceTexture</c>.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/Surface#Surface(android.graphics.SurfaceTexture)" title="Reference documentation">Java documentation for <code>android.view.Surface.Surface(android.graphics.SurfaceTexture)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 14" />
       </Docs>
@@ -95,9 +105,20 @@
         <Parameter Name="from" Type="Android.Views.SurfaceControl" />
       </Parameters>
       <Docs>
-        <param name="from">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="from">The SurfaceControl to associate this Surface with</param>
+        <summary>Create a Surface associated with a given <c>SurfaceControl</c>.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/Surface#Surface(android.view.SurfaceControl)" title="Reference documentation">Java documentation for <code>android.view.Surface.Surface(android.view.SurfaceControl)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -967,14 +988,24 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="frameRate">To be added.</param>
-        <param name="compatibility">To be added.</param>
-        <param name="changeFrameRateStrategy">To be added.</param>
+        <param name="frameRate">The intended frame rate of this surface, in frames per second. 0
+            is a special value that indicates the app will accept the system's choice for the
+            display frame rate, which is the default behavior if this function isn't
+            called. The &lt;code&gt;frameRate&lt;/code&gt; parameter does &lt;em&gt;not&lt;/em&gt; need to be a valid refresh
+            rate for this device's display - e.g., it's fine to pass 30fps to a device that can only run
+            the display at 60fps.</param>
+        <param name="compatibility">The frame rate compatibility of this surface. The
+            compatibility value may influence the system's choice of display frame rate.
+            This parameter is ignored when &lt;code&gt;frameRate&lt;/code&gt; is 0.</param>
+        <param name="changeFrameRateStrategy">Whether display refresh rate transitions caused by this
+            surface should be seamless. A seamless transition is one that doesn't have any visual
+            interruptions, such as a black screen for a second or two. This parameter is ignored when
+            &lt;code&gt;frameRate&lt;/code&gt; is 0.</param>
         <summary>Sets the intended frame rate for this surface.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Surface#setFrameRate(float,%20int)" title="Reference documentation">Java documentation for <code>android.view.Surface.setFrameRate(float, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Surface#setFrameRate(float,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.Surface.setFrameRate(float, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/TextureView.xml b/docs/Mono.Android/en/Android.Views/TextureView.xml
index 800e150618..287a622044 100644
--- a/docs/Mono.Android/en/Android.Views/TextureView.xml
+++ b/docs/Mono.Android/en/Android.Views/TextureView.xml
@@ -92,13 +92,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The context to associate this view with.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
         <summary>Creates a new TextureView.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/TextureView#TextureView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.TextureView.TextureView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/TextureView#TextureView(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.TextureView.TextureView(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,14 +155,16 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The context to associate this view with.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
         <summary>Creates a new TextureView.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/TextureView#TextureView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.TextureView.TextureView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/TextureView#TextureView(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.view.TextureView.TextureView(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -197,15 +199,20 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
         <param name="context">The context to associate this view with.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                   supplies default values for the view, used only if
+                   defStyleAttr is 0 or can not be found in the theme. Can be 0
+                   to not look for defaults.</param>
         <summary>Creates a new TextureView.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/TextureView#TextureView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.TextureView.TextureView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/TextureView#TextureView(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.TextureView.TextureView(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -323,15 +330,14 @@
       </Parameters>
       <Docs>
         <param name="bitmap">The bitmap to copy the content of the surface texture into,
-               cannot be null, all configurations are supported</param>
-        <summary>Returns a <c>android.graphics.Bitmap</c> representation of the content
-            of the associated surface texture.</summary>
-        <returns>A valid <c>Bitmap.Config#ARGB_8888</c> bitmap, or null if the surface
-                    texture is not available or the width &amp;lt;= 0 or the height &amp;lt;= 0</returns>
+                          cannot be null, all configurations are supported</param>
+        <summary>Copies the content of this view's surface texture into the specified
+            bitmap.</summary>
+        <returns>The bitmap specified as a parameter</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/TextureView#getBitmap()" title="Reference documentation">Java documentation for <code>android.view.TextureView.getBitmap()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/TextureView#getBitmap(android.graphics.Bitmap)" title="Reference documentation">Java documentation for <code>android.view.TextureView.getBitmap(android.graphics.Bitmap)</code>.</a>
             </format>
           </para>
           <para>
@@ -378,11 +384,11 @@
         <summary>Returns a <c>android.graphics.Bitmap</c> representation of the content
             of the associated surface texture.</summary>
         <returns>A valid <c>Bitmap.Config#ARGB_8888</c> bitmap, or null if the surface
-                    texture is not available or the width &amp;lt;= 0 or the height &amp;lt;= 0</returns>
+                    texture is not available or width is &amp;lt;= 0 or height is &amp;lt;= 0</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/TextureView#getBitmap()" title="Reference documentation">Java documentation for <code>android.view.TextureView.getBitmap()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/TextureView#getBitmap(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.TextureView.getBitmap(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -574,14 +580,16 @@
         <Parameter Name="dirty" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="dirty">Area of the surface that will be modified.</param>
-        <summary>Start editing the pixels in the surface.</summary>
+        <param name="dirty">Area of the surface that will be modified. If null the area of the entire
+                         surface is used.</param>
+        <summary>Just like <c>#lockCanvas()</c> but allows specification of a dirty
+            rectangle.</summary>
         <returns>A Canvas used to draw into the surface, or null if the surface cannot be locked for
             drawing (see <c>#isAvailable()</c>).</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/TextureView#lockCanvas()" title="Reference documentation">Java documentation for <code>android.view.TextureView.lockCanvas()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/TextureView#lockCanvas(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.TextureView.lockCanvas(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/VelocityTracker.xml b/docs/Mono.Android/en/Android.Views/VelocityTracker.xml
index b142620890..639aaf3181 100644
--- a/docs/Mono.Android/en/Android.Views/VelocityTracker.xml
+++ b/docs/Mono.Android/en/Android.Views/VelocityTracker.xml
@@ -181,17 +181,16 @@
       </Parameters>
       <Docs>
         <param name="units">The units you would like the velocity in.  A value of 1
- provides pixels per millisecond, 1000 provides pixels per second, etc.</param>
+            provides pixels per millisecond, 1000 provides pixels per second, etc.</param>
         <param name="maxVelocity">The maximum velocity that can be computed by this method.
- This value must be declared in the same unit as the units parameter. This value
- must be positive.
-</param>
-        <summary>Equivalent to invoking <c>#computeCurrentVelocity(int, float)</c> with a maximum
-            velocity of Float.</summary>
+            This value must be declared in the same unit as the units parameter. This value
+            must be positive.</param>
+        <summary>Compute the current velocity based on the points that have been
+            collected.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/VelocityTracker#computeCurrentVelocity(int)" title="Reference documentation">Java documentation for <code>android.view.VelocityTracker.computeCurrentVelocity(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/VelocityTracker#computeCurrentVelocity(int,%20float)" title="Reference documentation">Java documentation for <code>android.view.VelocityTracker.computeCurrentVelocity(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -232,7 +231,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/VelocityTracker#getXVelocity()" title="Reference documentation">Java documentation for <code>android.view.VelocityTracker.getXVelocity()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/VelocityTracker#getXVelocity(int)" title="Reference documentation">Java documentation for <code>android.view.VelocityTracker.getXVelocity(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -273,7 +272,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/VelocityTracker#getYVelocity()" title="Reference documentation">Java documentation for <code>android.view.VelocityTracker.getYVelocity()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/VelocityTracker#getYVelocity(int)" title="Reference documentation">Java documentation for <code>android.view.VelocityTracker.getYVelocity(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/View.xml b/docs/Mono.Android/en/Android.Views/View.xml
index 4e5fdf974d..5f3bdc48d4 100644
--- a/docs/Mono.Android/en/Android.Views/View.xml
+++ b/docs/Mono.Android/en/Android.Views/View.xml
@@ -70,12 +70,13 @@
         <Parameter Name="context" Type="Android.Content.Context" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <summary>Non-public constructor for use in testing</summary>
+        <param name="context">The Context the view is running in, through which it can
+                   access the current theme, resources, etc.</param>
+        <summary>Simple constructor to use when creating a view from code.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#View()" title="Reference documentation">Java documentation for <code>android.view.View.View()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#View(android.content.Context)" title="Reference documentation">Java documentation for <code>android.view.View.View(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -108,13 +109,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <summary>Non-public constructor for use in testing</summary>
+        <param name="context">The Context the view is running in, through which it can
+                   access the current theme, resources, etc.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <summary>Constructor that is called when inflating a view from XML.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#View()" title="Reference documentation">Java documentation for <code>android.view.View.View()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#View(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.view.View.View(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -172,14 +174,18 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <summary>Non-public constructor for use in testing</summary>
+        <param name="context">The Context the view is running in, through which it can
+                   access the current theme, resources, etc.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <summary>Perform inflation from XML and apply a class-specific base style from a
+            theme attribute.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#View()" title="Reference documentation">Java documentation for <code>android.view.View.View()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#View(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.View(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -215,15 +221,22 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
-        <summary>Non-public constructor for use in testing</summary>
+        <param name="context">The Context the view is running in, through which it can
+                   access the current theme, resources, etc.</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                   supplies default values for the view, used only if
+                   defStyleAttr is 0 or can not be found in the theme. Can be 0
+                   to not look for defaults.</param>
+        <summary>Perform inflation from XML and apply a class-specific base style from a
+            theme attribute or style resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#View()" title="Reference documentation">Java documentation for <code>android.view.View.View()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#View(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.View(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -928,15 +941,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="focusableMode">To be added.</param>
-        <param name="views">Focusable views found so far</param>
-        <param name="direction">The direction of the focus</param>
-        <summary>Add any focusable views that are descendants of this view (possibly
+        <param name="views">Focusable views found so far or null if all we are interested is
+                   the number of focusables.</param>
+        <param name="direction">The direction of the focus.</param>
+        <param name="focusableMode">The type of focusables to be added.</param>
+        <summary>Adds any focusable views that are descendants of this view (possibly
             including this view if it is focusable itself) to views.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#addFocusables(java.util.ArrayList,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.addFocusables(java.util.ArrayList, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#addFocusables(java.util.ArrayList,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.addFocusables(java.util.ArrayList, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1563,7 +1577,6 @@
       </Parameters>
       <Docs>
         <param name="value">To be added.</param>
-        <param name="values">map of values to be autofilled, keyed by virtual child id.</param>
         <summary>Automatically fills the content of the virtual children within this view.</summary>
         <remarks>
           <para>
@@ -2473,14 +2486,14 @@
       </Parameters>
       <Docs>
         <param name="startDelay">the delay, in milliseconds, after which the animation
-        should start; when the delay is 0, the animation starts
-        immediately</param>
+                   should start; when the delay is 0, the animation starts
+                   immediately</param>
         <summary>Trigger the scrollbars to draw.</summary>
         <returns>true if the animation is played, false otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#awakenScrollBars()" title="Reference documentation">Java documentation for <code>android.view.View.awakenScrollBars()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#awakenScrollBars(int)" title="Reference documentation">Java documentation for <code>android.view.View.awakenScrollBars(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2523,15 +2536,15 @@
       </Parameters>
       <Docs>
         <param name="startDelay">the delay, in milliseconds, after which the animation
-        should start; when the delay is 0, the animation starts
-        immediately</param>
+                   should start; when the delay is 0, the animation starts
+                   immediately</param>
         <param name="invalidate">Whether this method should call invalidate</param>
         <summary>Trigger the scrollbars to draw.</summary>
         <returns>true if the animation is played, false otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#awakenScrollBars()" title="Reference documentation">Java documentation for <code>android.view.View.awakenScrollBars()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#awakenScrollBars(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.View.awakenScrollBars(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -3010,11 +3023,11 @@
       </Parameters>
       <Docs>
         <param name="autoScale">To be added.</param>
-        <summary>Calling this method is equivalent to calling &lt;code&gt;buildDrawingCache(false)&lt;/code&gt;.</summary>
+        <summary>Forces the drawing cache to be built if the drawing cache is invalid.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#buildDrawingCache()" title="Reference documentation">Java documentation for <code>android.view.View.buildDrawingCache()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#buildDrawingCache(boolean)" title="Reference documentation">Java documentation for <code>android.view.View.buildDrawingCache(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -8256,9 +8269,8 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="focusable">One of <c>#NOT_FOCUSABLE</c>, <c>#FOCUSABLE</c>,
-                             or <c>#FOCUSABLE_AUTO</c>.</param>
-        <summary>Returns whether this View is currently able to take focus. -or- Sets whether this view can receive focus.</summary>
+        <param name="focusable">If true, this view can receive the focus.</param>
+        <summary>Returns whether this View is currently able to take focus. -or- Set whether this view can receive the focus.</summary>
         <value>True if this view can take focus, or false otherwise.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -8270,7 +8282,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#setFocusable(int)" title="Reference documentation">Java documentation for <code>android.view.View.setFocusable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#setFocusable(boolean)" title="Reference documentation">Java documentation for <code>android.view.View.setFocusable(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -9288,14 +9300,17 @@
         <Parameter Name="outRect" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="outRect">To be added.</param>
-        <summary>Returns a copy of the current <c>#setClipBounds(Rect) clipBounds</c>.</summary>
-        <returns>A copy of the current clip bounds if clip bounds are set,
-            otherwise null.</returns>
+        <param name="outRect">rectangle in which to place the clip bounds of the view</param>
+        <summary>Populates an output rectangle with the clip bounds of the view,
+            returning <c>true</c> if successful or <c>false</c> if the view's
+            clip bounds are <c>null</c>.</summary>
+        <returns>
+          <c>true</c> if successful or <c>false</c> if the view's
+                    clip bounds are <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#getClipBounds()" title="Reference documentation">Java documentation for <code>android.view.View.getClipBounds()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#getClipBounds(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.View.getClipBounds(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -9419,14 +9434,14 @@
       </Parameters>
       <Docs>
         <param name="autoScale">Indicates whether the generated bitmap should be scaled based on
-        the current density of the screen when the application is in compatibility
-        mode.</param>
-        <summary>Calling this method is equivalent to calling &lt;code&gt;getDrawingCache(false)&lt;/code&gt;.</summary>
-        <returns>A non-scaled bitmap representing this view or null if cache is disabled.</returns>
+                   the current density of the screen when the application is in compatibility
+                   mode.</param>
+        <summary>Returns the bitmap in which this view drawing is cached.</summary>
+        <returns>A bitmap representing this view or null if cache is disabled.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#getDrawingCache()" title="Reference documentation">Java documentation for <code>android.view.View.getDrawingCache()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#getDrawingCache(boolean)" title="Reference documentation">Java documentation for <code>android.view.View.getDrawingCache(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -9640,8 +9655,6 @@
       <Docs>
         <param name="r">If true is returned, r holds the global coordinates of the
                    visible portion of this view.</param>
-        <param name="globalOffset">If true is returned, globalOffset holds the dx,dy
-                   between this view and its root. globalOffet may be null.</param>
         <summary>If some part of this view is not clipped by any of its parents, then
             return that area in r in global (root) coordinates.</summary>
         <returns>true if r is non-empty (i.e. part of the view is visible at the
@@ -9920,11 +9933,19 @@
         <Parameter Name="outLocation" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="outLocation">To be added.</param>
-        <summary>
-        </summary>
+        <param name="outLocation">an array of two integers in which to hold the coordinates</param>
+        <summary>Computes the coordinates of this view on the screen.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/View#getLocationOnScreen(int[])" title="Reference documentation">Java documentation for <code>android.view.View.getLocationOnScreen(int[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -9992,13 +10013,13 @@
       </Parameters>
       <Docs>
         <param name="key">The key identifying the tag</param>
-        <summary>Returns this view's tag.</summary>
+        <summary>Returns the tag associated with this view and the specified key.</summary>
         <returns>the Object stored in this view as a tag, or <c>null</c> if not
                     set</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#getTag()" title="Reference documentation">Java documentation for <code>android.view.View.getTag()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#getTag(int)" title="Reference documentation">Java documentation for <code>android.view.View.getTag(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -12008,13 +12029,12 @@
         <Parameter Name="dirty" Type="Android.Graphics.Rect" />
       </Parameters>
       <Docs>
-        <param name="dirty">the rectangle representing the bounds of the dirty region
-</param>
-        <summary>Invalidate the whole view.</summary>
+        <param name="dirty">the rectangle representing the bounds of the dirty region</param>
+        <summary>Mark the area defined by dirty as needing to be drawn.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#invalidate()" title="Reference documentation">Java documentation for <code>android.view.View.invalidate()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#invalidate(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.View.invalidate(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -12059,13 +12079,12 @@
         <param name="l">the left position of the dirty region</param>
         <param name="t">the top position of the dirty region</param>
         <param name="r">the right position of the dirty region</param>
-        <param name="b">the bottom position of the dirty region
-</param>
-        <summary>Invalidate the whole view.</summary>
+        <param name="b">the bottom position of the dirty region</param>
+        <summary>Mark the area defined by the rect (l,t,r,b) as needing to be drawn.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#invalidate()" title="Reference documentation">Java documentation for <code>android.view.View.invalidate()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#invalidate(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.invalidate(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -13811,7 +13830,6 @@
         <ReturnType>Android.Views.ViewGroup+LayoutParams</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="params">The layout parameters for this view, cannot be null</param>
         <summary>Get the LayoutParams associated with this view. -or- Set the layout parameters associated with this view.</summary>
         <value>The LayoutParams associated with this view, or null if no
                     parameters have been set yet</value>
@@ -16111,7 +16129,6 @@
         <ReturnType>Android.Views.View+IOnFocusChangeListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="l">The callback that will run.</param>
         <summary>Returns the focus-change callback registered for this view. -or- Register a callback to be invoked when focus of this view changed.</summary>
         <value>The callback, or null if one is not registered.</value>
         <remarks>
@@ -18911,15 +18928,15 @@
         <Parameter Name="y" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <param name="y">To be added.</param>
+        <param name="x">the x coordinate of the context click</param>
+        <param name="y">the y coordinate of the context click</param>
         <summary>Call this view's OnContextClickListener, if it is defined.</summary>
         <returns>True if there was an assigned OnContextClickListener that consumed the event, false
                     otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#performContextClick()" title="Reference documentation">Java documentation for <code>android.view.View.performContextClick()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#performContextClick(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.View.performContextClick(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -19017,16 +19034,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">Additional flags as per <see cref="T:Android.Views.HapticFeedbackConstants" />.
-</param>
         <param name="feedbackConstant">One of the constants defined in
             <c>HapticFeedbackConstants</c></param>
+        <param name="flags">Additional flags as per <c>HapticFeedbackConstants</c>.</param>
         <summary>BZZZTT!!1!</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#performHapticFeedback(int)" title="Reference documentation">Java documentation for <code>android.view.View.performHapticFeedback(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#performHapticFeedback(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.performHapticFeedback(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -19102,8 +19118,10 @@
         <Parameter Name="y" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <param name="y">To be added.</param>
+        <param name="x">x coordinate of the anchoring touch event, or <c>Float#NaN</c>
+                     to disable anchoring</param>
+        <param name="y">y coordinate of the anchoring touch event, or <c>Float#NaN</c>
+                     to disable anchoring</param>
         <summary>Calls this view's OnLongClickListener, if it is defined.</summary>
         <returns>
           <c>true</c> if one of the above receivers consumed the event,
@@ -19111,7 +19129,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#performLongClick()" title="Reference documentation">Java documentation for <code>android.view.View.performLongClick()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#performLongClick(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.View.performLongClick(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -19594,11 +19612,12 @@
         <param name="top">The top coordinate of the rectangle to invalidate.</param>
         <param name="right">The right coordinate of the rectangle to invalidate.</param>
         <param name="bottom">The bottom coordinate of the rectangle to invalidate.</param>
-        <summary>Cause an invalidate to happen on a subsequent cycle through the event loop.</summary>
+        <summary>Cause an invalidate of the specified area to happen on a subsequent cycle
+            through the event loop.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#postInvalidate()" title="Reference documentation">Java documentation for <code>android.view.View.postInvalidate()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#postInvalidate(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.postInvalidate(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -19684,18 +19703,18 @@
         <Parameter Name="bottom" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="delayMilliseconds">the duration in milliseconds to delay the
+                    invalidation by</param>
         <param name="left">The left coordinate of the rectangle to invalidate.</param>
         <param name="top">The top coordinate of the rectangle to invalidate.</param>
         <param name="right">The right coordinate of the rectangle to invalidate.</param>
         <param name="bottom">The bottom coordinate of the rectangle to invalidate.</param>
-        <param name="delayMilliseconds">the duration in milliseconds to delay the
-                    invalidation by</param>
-        <summary>Cause an invalidate to happen on a subsequent cycle through the event
-            loop.</summary>
+        <summary>Cause an invalidate of the specified area to happen on a subsequent cycle
+            through the event loop.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#postInvalidateDelayed(long)" title="Reference documentation">Java documentation for <code>android.view.View.postInvalidateDelayed(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#postInvalidateDelayed(long,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.postInvalidateDelayed(long, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -19779,12 +19798,12 @@
         <param name="top">The top coordinate of the rectangle to invalidate.</param>
         <param name="right">The right coordinate of the rectangle to invalidate.</param>
         <param name="bottom">The bottom coordinate of the rectangle to invalidate.</param>
-        <summary>Cause an invalidate to happen on the next animation time step, typically the
-            next display frame.</summary>
+        <summary>Cause an invalidate of the specified area to happen on the next animation
+            time step, typically the next display frame.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#postInvalidateOnAnimation()" title="Reference documentation">Java documentation for <code>android.view.View.postInvalidateOnAnimation()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#postInvalidateOnAnimation(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.postInvalidateOnAnimation(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -21000,12 +21019,12 @@
       <Docs>
         <param name="direction">One of FOCUS_UP, FOCUS_DOWN, FOCUS_LEFT, and FOCUS_RIGHT</param>
         <summary>Call this to try to give focus to a specific view or to one of its
-            descendants.</summary>
+            descendants and give it a hint about what direction focus is heading.</summary>
         <returns>Whether this view or one of its descendants actually took focus.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#requestFocus()" title="Reference documentation">Java documentation for <code>android.view.View.requestFocus()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#requestFocus(int)" title="Reference documentation">Java documentation for <code>android.view.View.requestFocus(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -21050,15 +21069,16 @@
       <Docs>
         <param name="direction">One of FOCUS_UP, FOCUS_DOWN, FOCUS_LEFT, and FOCUS_RIGHT</param>
         <param name="previouslyFocusedRect">The rectangle (in this View's coordinate system)
-        to give a finer grained hint about where focus is coming from.  May be null
-        if there is no hint.</param>
-        <summary>Call this to try to give focus to a specific view or to one of its
-            descendants.</summary>
+                   to give a finer grained hint about where focus is coming from.  May be null
+                   if there is no hint.</param>
+        <summary>Call this to try to give focus to a specific view or to one of its descendants
+            and give it hints about the direction and a specific rectangle that the focus
+            is coming from.</summary>
         <returns>Whether this view or one of its descendants actually took focus.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#requestFocus()" title="Reference documentation">Java documentation for <code>android.view.View.requestFocus()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#requestFocus(int,%20android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.View.requestFocus(int, android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
@@ -21249,15 +21269,15 @@
         <Parameter Name="immediate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="immediate">True to forbid animated scrolling, false otherwise</param>
         <param name="rectangle">The rectangle in the View's content coordinate space</param>
+        <param name="immediate">True to forbid animated scrolling, false otherwise</param>
         <summary>Request that a rectangle of this view be visible on the screen,
             scrolling if necessary just enough.</summary>
         <returns>Whether any parent scrolled.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#requestRectangleOnScreen(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.View.requestRectangleOnScreen(android.graphics.Rect)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#requestRectangleOnScreen(android.graphics.Rect,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.View.requestRectangleOnScreen(android.graphics.Rect, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -21293,14 +21313,11 @@
       </Parameters>
       <Docs>
         <param name="e">To be added.</param>
-        <param name="source">The combined input source class to request unbuffered dispatch for. All
-                          events coming from these source classes will not be buffered. Set to
-                          <c>InputDevice#SOURCE_CLASS_NONE</c> in order to return to default behaviour.</param>
-        <summary>Request unbuffered dispatch of the given event source class to this view.</summary>
+        <summary>Request unbuffered dispatch of the given stream of MotionEvents to this View.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#requestUnbufferedDispatch(int)" title="Reference documentation">Java documentation for <code>android.view.View.requestUnbufferedDispatch(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#requestUnbufferedDispatch(android.view.MotionEvent)" title="Reference documentation">Java documentation for <code>android.view.View.requestUnbufferedDispatch(android.view.MotionEvent)</code>.</a>
             </format>
           </para>
           <para>
@@ -25447,14 +25464,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mask">To be added.</param>
         <param name="indicators">a bitmask of indicators that should be enabled, or
                               <c>0</c> to disable all indicators</param>
-        <summary>Sets the state of all scroll indicators.</summary>
+        <param name="mask">To be added.</param>
+        <summary>Sets the state of the scroll indicators specified by the mask.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#setScrollIndicators(int)" title="Reference documentation">Java documentation for <code>android.view.View.setScrollIndicators(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#setScrollIndicators(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.View.setScrollIndicators(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -25907,16 +25924,19 @@
         <Parameter Name="y" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <param name="y">To be added.</param>
-        <summary>Shows the context menu for this view.</summary>
+        <param name="x">the X coordinate in pixels relative to the view to which the
+                     menu should be anchored, or <c>Float#NaN</c> to disable anchoring</param>
+        <param name="y">the Y coordinate in pixels relative to the view to which the
+                     menu should be anchored, or <c>Float#NaN</c> to disable anchoring</param>
+        <summary>Shows the context menu for this view anchored to the specified
+            view-relative coordinate.</summary>
         <returns>
           <c>true</c> if the context menu was shown, <c>false</c>
                     otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#showContextMenu()" title="Reference documentation">Java documentation for <code>android.view.View.showContextMenu()</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#showContextMenu(float,%20float)" title="Reference documentation">Java documentation for <code>android.view.View.showContextMenu(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -26133,8 +26153,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
         <param name="callback">Callback that will control the lifecycle of the action mode</param>
+        <param name="type">To be added.</param>
         <summary>Start an action mode with the default type <c>ActionMode#TYPE_PRIMARY</c>.</summary>
         <returns>The new action mode if it is started, null otherwise</returns>
         <remarks>
@@ -27242,9 +27262,8 @@
         <ReturnType>Java.Lang.Object</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="key">The key identifying the tag</param>
-        <param name="tag">An Object to tag the view with</param>
-        <summary>Returns this view's tag. -or- Sets a tag associated with this view and a key.</summary>
+        <param name="tag">an Object to tag the view with</param>
+        <summary>Returns this view's tag. -or- Sets the tag associated with this view.</summary>
         <value>the Object stored in this view as a tag, or <c>null</c> if not
                     set</value>
         <remarks>
@@ -27257,7 +27276,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#setTag(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.view.View.setTag(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#setTag(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.view.View.setTag(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -28867,14 +28886,13 @@
         <Parameter Name="what" Type="Java.Lang.IRunnable" />
       </Parameters>
       <Docs>
-        <param name="what">the action to cancel
-</param>
-        <param name="who">The Drawable to unschedule.</param>
-        <summary>Unschedule any events associated with the given Drawable.</summary>
+        <param name="who">the recipient of the action</param>
+        <param name="what">the action to cancel</param>
+        <summary>Cancels a scheduled action on a drawable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/View#unscheduleDrawable(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.view.View.unscheduleDrawable(android.graphics.drawable.Drawable)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/View#unscheduleDrawable(android.graphics.drawable.Drawable,%20java.lang.Runnable)" title="Reference documentation">Java documentation for <code>android.view.View.unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ViewGroup.xml b/docs/Mono.Android/en/Android.Views/ViewGroup.xml
index 3088cbe1f9..12ecb40c84 100644
--- a/docs/Mono.Android/en/Android.Views/ViewGroup.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewGroup.xml
@@ -303,9 +303,9 @@
         <Parameter Name="params" Type="Android.Views.ViewGroup+LayoutParams" />
       </Parameters>
       <Docs>
+        <param name="child">the child view to add</param>
         <param name="params">the layout parameters to set on the child
 </param>
-        <param name="child">the child view to add</param>
         <summary>Adds a child view.</summary>
         <remarks>
           <para>
@@ -346,13 +346,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the position at which to add the child</param>
         <param name="child">the child view to add</param>
+        <param name="index">the position at which to add the child</param>
         <summary>Adds a child view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ViewGroup#addView(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.ViewGroup.addView(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ViewGroup#addView(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.view.ViewGroup.addView(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -390,10 +390,10 @@
         <Parameter Name="params" Type="Android.Views.ViewGroup+LayoutParams" />
       </Parameters>
       <Docs>
+        <param name="child">the child view to add</param>
         <param name="index">the position at which to add the child or -1 to add last</param>
         <param name="params">the layout parameters to set on the child
 </param>
-        <param name="child">the child view to add</param>
         <summary>Adds a child view.</summary>
         <remarks>
           <para>
@@ -438,11 +438,12 @@
         <param name="width">To be added.</param>
         <param name="height">To be added.</param>
         <param name="child">the child view to add</param>
-        <summary>Adds a child view.</summary>
+        <summary>Adds a child view with this ViewGroup's default layout parameters and the
+            specified width and height.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ViewGroup#addView(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.ViewGroup.addView(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ViewGroup#addView(android.view.View,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.ViewGroup.addView(android.view.View, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -525,11 +526,11 @@
         <Parameter Name="preventRequestLayout" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="preventRequestLayout">if true, calling this method will not trigger a
-        layout request on child</param>
         <param name="child">the view to add to the group</param>
         <param name="index">the index at which the child must be added or -1 to add last</param>
         <param name="params">the layout parameters to associate with the child</param>
+        <param name="preventRequestLayout">if true, calling this method will not trigger a
+        layout request on child</param>
         <summary>Adds a view during layout.</summary>
         <returns>true if the child was added, false otherwise</returns>
         <remarks>
@@ -1594,12 +1595,11 @@
       </Parameters>
       <Docs>
         <param name="child">the child to detach</param>
-        <param name="index">the index of the child to detach</param>
         <summary>Detaches a view from its parent.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ViewGroup#detachViewFromParent(int)" title="Reference documentation">Java documentation for <code>android.view.ViewGroup.detachViewFromParent(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ViewGroup#detachViewFromParent(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.ViewGroup.detachViewFromParent(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -2195,7 +2195,6 @@
       <Docs>
         <param name="p">The layout parameters to convert into a suitable set of layout parameters
           for this ViewGroup.</param>
-        <param name="attrs">the attributes to build the layout parameters from</param>
         <summary>Returns a new set of layout parameters based on the supplied attributes set.</summary>
         <returns>an instance of <c>android.view.ViewGroup.LayoutParams</c> or one
                     of its descendants</returns>
@@ -2310,11 +2309,20 @@
       </Parameters>
       <Docs>
         <param name="childCount">To be added.</param>
-        <param name="drawingPosition">To be added.</param>
-        <summary>Returns the index of the child to draw for this iteration.</summary>
-        <returns>To be added.</returns>
+        <param name="drawingPosition">the drawing order position.</param>
+        <summary>Converts drawing order position to container position.</summary>
+        <returns>the container position of a child for this drawing order position.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/ViewGroup#getChildDrawingOrder(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.ViewGroup.getChildDrawingOrder(int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <altmember cref="P:Android.Views.ViewGroup.ChildrenDrawingOrderEnabled" />
@@ -2788,7 +2796,6 @@
         <ReturnType>Android.Views.Animations.Animation+IAnimationListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="animationListener">the layout animation listener</param>
         <summary>Returns the animation listener to which layout animation events are
             sent. -or- Specifies the animation listener to which layout animation events must
             be sent.</summary>
diff --git a/docs/Mono.Android/en/Android.Views/ViewStructure.xml b/docs/Mono.Android/en/Android.Views/ViewStructure.xml
index 0cd4b0afb0..8514ed94b3 100644
--- a/docs/Mono.Android/en/Android.Views/ViewStructure.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewStructure.xml
@@ -663,13 +663,14 @@
         <Parameter Name="virtualId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parentId">To be added.</param>
-        <param name="virtualId">To be added.</param>
-        <summary>Sets the <c>AutofillId</c> associated with this node.</summary>
+        <param name="parentId">id of the parent node.</param>
+        <param name="virtualId">an opaque ID to the Android System; it's the same id used on
+                       <c>View#autofill(android.util.SparseArray)</c>.</param>
+        <summary>Sets the <c>AutofillId</c> for this virtual node.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ViewStructure#setAutofillId(android.view.autofill.AutofillId)" title="Reference documentation">Java documentation for <code>android.view.ViewStructure.setAutofillId(android.view.autofill.AutofillId)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ViewStructure#setAutofillId(android.view.autofill.AutofillId,%20int)" title="Reference documentation">Java documentation for <code>android.view.ViewStructure.setAutofillId(android.view.autofill.AutofillId, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1908,11 +1909,12 @@
         <param name="text">To be added.</param>
         <param name="selectionStart">To be added.</param>
         <param name="selectionEnd">To be added.</param>
-        <summary>Set the text that is associated with this view.</summary>
+        <summary>Like <c>#setText(CharSequence)</c> but with an active selection
+            extending from &lt;var&gt;selectionStart&lt;/var&gt; through &lt;var&gt;selectionEnd&lt;/var&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ViewStructure#setText(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.ViewStructure.setText(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ViewStructure#setText(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.ViewStructure.setText(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1945,11 +1947,12 @@
         <param name="text">To be added.</param>
         <param name="selectionStart">To be added.</param>
         <param name="selectionEnd">To be added.</param>
-        <summary>Set the text that is associated with this view.</summary>
+        <summary>Like <c>#setText(CharSequence)</c> but with an active selection
+            extending from &lt;var&gt;selectionStart&lt;/var&gt; through &lt;var&gt;selectionEnd&lt;/var&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/ViewStructure#setText(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.view.ViewStructure.setText(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/ViewStructure#setText(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.ViewStructure.setText(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/ViewStub.xml b/docs/Mono.Android/en/Android.Views/ViewStub.xml
index d36fb3dc71..caf24749ba 100644
--- a/docs/Mono.Android/en/Android.Views/ViewStub.xml
+++ b/docs/Mono.Android/en/Android.Views/ViewStub.xml
@@ -56,7 +56,6 @@
       </Parameters>
       <Docs>
         <param name="context">The application's environment.</param>
-        <param name="layoutResource">The reference to a layout resource that will be inflated.</param>
         <summary>Creates a new ViewStub with the specified layout resource.</summary>
         <remarks>
           <para>
@@ -94,9 +93,8 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The application's environment.</param>
-        <param name="layoutResource">The reference to a layout resource that will be inflated.</param>
+        <param name="attrs">To be added.</param>
         <summary>Creates a new ViewStub with the specified layout resource.</summary>
         <remarks>
           <para>
@@ -174,10 +172,9 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">The application's environment.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
-        <param name="context">The application's environment.</param>
-        <param name="layoutResource">The reference to a layout resource that will be inflated.</param>
         <summary>Creates a new ViewStub with the specified layout resource.</summary>
         <remarks>
           <para>
@@ -217,11 +214,10 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">The application's environment.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="defStyleRes">To be added.</param>
-        <param name="context">The application's environment.</param>
-        <param name="layoutResource">The reference to a layout resource that will be inflated.</param>
         <summary>Creates a new ViewStub with the specified layout resource.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/Window.xml b/docs/Mono.Android/en/Android.Views/Window.xml
index 11fa0b1809..b34c6dd5a8 100644
--- a/docs/Mono.Android/en/Android.Views/Window.xml
+++ b/docs/Mono.Android/en/Android.Views/Window.xml
@@ -353,8 +353,6 @@
         <ReturnType>Android.Views.WindowManagerLayoutParams</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="a">The new window attributes, which will completely override any
-                     current values.</param>
         <summary>Retrieve the current window attributes associated with this panel. -or- Specify custom window attributes.</summary>
         <value>WindowManager.LayoutParams Either the existing window
                     attributes object, or a freshly created one if there is none.</value>
@@ -404,7 +402,6 @@
         <ReturnType>Android.Views.Window+ICallback</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="callback">The desired Callback interface.</param>
         <summary>Return the current Callback interface for this window. -or- Set the Callback interface for this window, used to intercept key
             events and other dynamic operations in the window.</summary>
         <value>To be added.</value>
@@ -3227,14 +3224,13 @@
       </Parameters>
       <Docs>
         <param name="view">The desired content to display.</param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
         <summary>Convenience for
             <c>#setContentView(View, android.view.ViewGroup.LayoutParams)</c>
-            to set the screen content from a layout resource.</summary>
+            set the screen content to an explicit view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Window#setContentView(int)" title="Reference documentation">Java documentation for <code>android.view.Window.setContentView(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Window#setContentView(android.view.View)" title="Reference documentation">Java documentation for <code>android.view.Window.setContentView(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -3316,7 +3312,6 @@
       <Docs>
         <param name="view">The desired content to display.</param>
         <param name="params">Layout parameters for the view.</param>
-        <param name="layoutResID">Resource ID to be inflated.</param>
         <summary>Convenience for
             <c>#setContentView(View, android.view.ViewGroup.LayoutParams)</c>
             to set the screen content from a layout resource.</summary>
@@ -4651,14 +4646,13 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mask">Flags specifying which options should be modified. Others will remain unchanged.
-</param>
         <param name="uiOptions">Flags specifying extra options for this window.</param>
+        <param name="mask">Flags specifying which options should be modified. Others will remain unchanged.</param>
         <summary>Set extra options that will influence the UI for this window.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Window#setUiOptions(int)" title="Reference documentation">Java documentation for <code>android.view.Window.setUiOptions(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Window#setUiOptions(int,%20int)" title="Reference documentation">Java documentation for <code>android.view.Window.setUiOptions(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4792,7 +4786,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/Window#setWindowManager(android.view.WindowManager,%20android.os.IBinder,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.view.Window.setWindowManager(android.view.WindowManager, android.os.IBinder, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/Window#setWindowManager(android.view.WindowManager,%20android.os.IBinder,%20java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.view.Window.setWindowManager(android.view.WindowManager, android.os.IBinder, java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Views/WindowInsets.xml b/docs/Mono.Android/en/Android.Views/WindowInsets.xml
index 5ff2f4d7d2..3a868da2d8 100644
--- a/docs/Mono.Android/en/Android.Views/WindowInsets.xml
+++ b/docs/Mono.Android/en/Android.Views/WindowInsets.xml
@@ -53,10 +53,19 @@
         <Parameter Name="src" Type="Android.Views.WindowInsets" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
+        <param name="src">Source to copy insets from</param>
         <summary>Construct a new WindowInsets, copying all values from a source WindowInsets.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/view/WindowInsets#WindowInsets(android.view.WindowInsets)" title="Reference documentation">Java documentation for <code>android.view.WindowInsets.WindowInsets(android.view.WindowInsets)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -530,17 +539,13 @@
         <Parameter Name="insets" Type="Android.Graphics.Insets" />
       </Parameters>
       <Docs>
-        <param name="insets">To be added.</param>
-        <param name="left">the amount of insets to remove from the left. Must be non-negative.</param>
-        <param name="top">the amount of insets to remove from the top. Must be non-negative.</param>
-        <param name="right">the amount of insets to remove from the right. Must be non-negative.</param>
-        <param name="bottom">the amount of insets to remove from the bottom. Must be non-negative.</param>
+        <param name="insets">the amount of insets to remove from all sides.</param>
         <summary>Returns a copy of this instance inset in the given directions.</summary>
         <returns>the inset insets</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/WindowInsets#inset(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.WindowInsets.inset(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/WindowInsets#inset(android.graphics.Insets)" title="Reference documentation">Java documentation for <code>android.view.WindowInsets.inset(android.graphics.Insets)</code>.</a>
             </format>
           </para>
           <para>
@@ -848,18 +853,14 @@
       </Parameters>
       <Docs>
         <param name="systemWindowInsets">New system window insets. Each field is the inset in pixels
-                           for that edge</param>
-        <param name="left">New left inset in pixels</param>
-        <param name="top">New top inset in pixels</param>
-        <param name="right">New right inset in pixels</param>
-        <param name="bottom">New bottom inset in pixels</param>
+                                      for that edge</param>
         <summary>Returns a copy of this WindowInsets with selected system window insets replaced
             with new values.</summary>
         <returns>A modified copy of this WindowInsets</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/view/WindowInsets#replaceSystemWindowInsets(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.view.WindowInsets.replaceSystemWindowInsets(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/view/WindowInsets#replaceSystemWindowInsets(android.graphics.Rect)" title="Reference documentation">Java documentation for <code>android.view.WindowInsets.replaceSystemWindowInsets(android.graphics.Rect)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Webkit/CookieManager.xml b/docs/Mono.Android/en/Android.Webkit/CookieManager.xml
index 78f3f44bb5..4925a1a01c 100644
--- a/docs/Mono.Android/en/Android.Webkit/CookieManager.xml
+++ b/docs/Mono.Android/en/Android.Webkit/CookieManager.xml
@@ -276,15 +276,13 @@
       </Parameters>
       <Docs>
         <param name="url">the URL for which the cookies are requested</param>
-        <param name="uri">the WebAddress for which the cookies are requested</param>
-        <summary>Gets cookie(s) for a given uri so that it can be set to "cookie:" in http
-            request header.</summary>
+        <summary>Gets all the cookies for the given URL.</summary>
         <returns>value the cookies as a string, using the format of the 'Cookie'
                           HTTP request header</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/CookieManager#getCookie(android.net.WebAddress)" title="Reference documentation">Java documentation for <code>android.webkit.CookieManager.getCookie(android.net.WebAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/CookieManager#getCookie(java.lang.String)" title="Reference documentation">Java documentation for <code>android.webkit.CookieManager.getCookie(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -780,15 +778,15 @@
         <Parameter Name="callback" Type="Android.Webkit.IValueCallback" />
       </Parameters>
       <Docs>
-        <param name="callback">To be added.</param>
         <param name="url">the URL for which the cookie is to be set</param>
         <param name="value">the cookie as a string, using the format of the 'Set-Cookie'
                          HTTP response header</param>
+        <param name="callback">a callback to be executed when the cookie has been set</param>
         <summary>Sets a single cookie (key-value pair) for the given URL.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/CookieManager#setCookie(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.webkit.CookieManager.setCookie(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/CookieManager#setCookie(java.lang.String,%20java.lang.String,%20android.webkit.ValueCallback)" title="Reference documentation">Java documentation for <code>android.webkit.CookieManager.setCookie(java.lang.String, java.lang.String, android.webkit.ValueCallback)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Webkit/WebChromeClient.xml b/docs/Mono.Android/en/Android.Webkit/WebChromeClient.xml
index e82cd87dcf..4a6bf304b5 100644
--- a/docs/Mono.Android/en/Android.Webkit/WebChromeClient.xml
+++ b/docs/Mono.Android/en/Android.Webkit/WebChromeClient.xml
@@ -300,14 +300,13 @@
         <param name="message">The error message to report.</param>
         <param name="lineNumber">The line number of the error.</param>
         <param name="sourceID">The name of the source file that caused the error.</param>
-        <param name="consoleMessage">Object containing details of the console message.</param>
-        <summary>Report a JavaScript console message to the host application.</summary>
+        <summary>Report a JavaScript error message to the host application.</summary>
         <returns>
           <c>true</c> if the message is handled by the client.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebChromeClient#onConsoleMessage(android.webkit.ConsoleMessage)" title="Reference documentation">Java documentation for <code>android.webkit.WebChromeClient.onConsoleMessage(android.webkit.ConsoleMessage)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebChromeClient#onConsoleMessage(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.webkit.WebChromeClient.onConsoleMessage(java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1174,8 +1173,6 @@
       </Parameters>
       <Docs>
         <param name="view">is the View object to be shown.</param>
-        <param name="requestedOrientation">An orientation constant as used in
-            <c>ActivityInfo#screenOrientation ActivityInfo.screenOrientation</c>.</param>
         <param name="callback">is the callback to be invoked if and when the view
             is dismissed.</param>
         <summary>Notify the host application that the current page would
diff --git a/docs/Mono.Android/en/Android.Webkit/WebMessage.xml b/docs/Mono.Android/en/Android.Webkit/WebMessage.xml
index 0f282d81e7..b6f02f05db 100644
--- a/docs/Mono.Android/en/Android.Webkit/WebMessage.xml
+++ b/docs/Mono.Android/en/Android.Webkit/WebMessage.xml
@@ -113,13 +113,13 @@
         <Parameter Name="ports" Type="Android.Webkit.WebMessagePort[]" />
       </Parameters>
       <Docs>
-        <param name="ports">To be added.</param>
         <param name="data">the data of the message.</param>
+        <param name="ports">the ports that are sent with the message.</param>
         <summary>Creates a WebMessage.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebMessage#WebMessage(java.lang.String)" title="Reference documentation">Java documentation for <code>android.webkit.WebMessage.WebMessage(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebMessage#WebMessage(java.lang.String,%20android.webkit.WebMessagePort[])" title="Reference documentation">Java documentation for <code>android.webkit.WebMessage.WebMessage(java.lang.String, android.webkit.WebMessagePort[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Webkit/WebMessagePort.xml b/docs/Mono.Android/en/Android.Webkit/WebMessagePort.xml
index a7f8e0f327..4bded7ad26 100644
--- a/docs/Mono.Android/en/Android.Webkit/WebMessagePort.xml
+++ b/docs/Mono.Android/en/Android.Webkit/WebMessagePort.xml
@@ -226,8 +226,8 @@
         <Parameter Name="handler" Type="Android.OS.Handler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="callback">the message callback.</param>
+        <param name="handler">To be added.</param>
         <summary>Sets a callback to receive message events on the main thread.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Webkit/WebResourceResponse.xml b/docs/Mono.Android/en/Android.Webkit/WebResourceResponse.xml
index fb5eb8637e..9278b7c36b 100644
--- a/docs/Mono.Android/en/Android.Webkit/WebResourceResponse.xml
+++ b/docs/Mono.Android/en/Android.Webkit/WebResourceResponse.xml
@@ -81,19 +81,14 @@
       <Docs>
         <param name="mimeType">the resource response's MIME type, for example <c>"text/html"</c>.</param>
         <param name="encoding">the resource response's character encoding, for example <c>"utf-8"</c>.</param>
-        <param name="statusCode">the status code needs to be in the ranges [100, 299], [400, 599].
-                              Causing a redirect by specifying a 3xx code is not supported.</param>
-        <param name="reasonPhrase">the phrase describing the status code, for example "OK". Must be
-                                non-empty.</param>
-        <param name="responseHeaders">the resource response's headers represented as a mapping of header
-                                   name -&gt; header value.</param>
         <param name="data">the input stream that provides the resource response's data. Must not be a
                         StringBufferInputStream.</param>
-        <summary>Constructs a resource response with the given parameters.</summary>
+        <summary>Constructs a resource response with the given MIME type, character encoding,
+            and input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebResourceResponse#WebResourceResponse(java.lang.String,%20java.lang.String,%20int,%20java.lang.String,%20java.util.Map,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.webkit.WebResourceResponse.WebResourceResponse(java.lang.String, java.lang.String, int, java.lang.String, java.util.Map, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebResourceResponse#WebResourceResponse(java.lang.String,%20java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>android.webkit.WebResourceResponse.WebResourceResponse(java.lang.String, java.lang.String, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Webkit/WebView.xml b/docs/Mono.Android/en/Android.Webkit/WebView.xml
index bcdf49f44d..cf4b6ac28f 100644
--- a/docs/Mono.Android/en/Android.Webkit/WebView.xml
+++ b/docs/Mono.Android/en/Android.Webkit/WebView.xml
@@ -108,13 +108,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">A Context object used to access application assets.</param>
-        <summary>Construct a new WebView with a Context object.</summary>
+        <param name="attrs">An AttributeSet passed to our parent.</param>
+        <summary>Construct a new WebView with layout parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebView#WebView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.webkit.WebView.WebView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebView#WebView(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.webkit.WebView.WebView(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -171,14 +171,15 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="context">A Context object used to access application assets.</param>
-        <summary>Construct a new WebView with a Context object.</summary>
+        <param name="attrs">An AttributeSet passed to our parent.</param>
+        <param name="defStyle">The default style resource ID.</param>
+        <summary>Construct a new WebView with layout parameters and a default style.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebView#WebView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.webkit.WebView.WebView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebView#WebView(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.webkit.WebView.WebView(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -217,10 +218,10 @@
         <Parameter Name="privateBrowsing" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="context">A Context object used to access application assets.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="privateBrowsing">To be added.</param>
-        <param name="context">A Context object used to access application assets.</param>
         <summary>Construct a new WebView with a Context object.</summary>
         <remarks>
           <para>
@@ -260,10 +261,10 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">A Context object used to access application assets.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="defStyleRes">To be added.</param>
-        <param name="context">A Context object used to access application assets.</param>
         <summary>Construct a new WebView with a Context object.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Webkit/WebViewClient.xml b/docs/Mono.Android/en/Android.Webkit/WebViewClient.xml
index 9acab1af13..89d5b478e1 100644
--- a/docs/Mono.Android/en/Android.Webkit/WebViewClient.xml
+++ b/docs/Mono.Android/en/Android.Webkit/WebViewClient.xml
@@ -436,17 +436,14 @@
         <Parameter Name="error" Type="Android.Webkit.WebResourceError" />
       </Parameters>
       <Docs>
-        <param name="request">To be added.</param>
-        <param name="error">To be added.</param>
         <param name="view">The WebView that is initiating the callback.</param>
-        <param name="errorCode">The error code corresponding to an ERROR_* value.</param>
-        <param name="description">A String describing the error.</param>
-        <param name="failingUrl">The url that failed to load.</param>
-        <summary>Report an error to the host application.</summary>
+        <param name="request">The originating request.</param>
+        <param name="error">Information about the error occurred.</param>
+        <summary>Report web resource loading error to the host application.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebViewClient#onReceivedError(android.webkit.WebView,%20int,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.webkit.WebViewClient.onReceivedError(android.webkit.WebView, int, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebViewClient#onReceivedError(android.webkit.WebView,%20android.webkit.WebResourceRequest,%20android.webkit.WebResourceError)" title="Reference documentation">Java documentation for <code>android.webkit.WebViewClient.onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError)</code>.</a>
             </format>
           </para>
           <para>
@@ -1043,10 +1040,9 @@
         <Parameter Name="url" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="url">The raw url of the resource.</param>
         <param name="view">The <c>android.webkit.WebView</c> that is requesting the
                         resource.</param>
-        <param name="request">Object containing the details of the request.</param>
+        <param name="url">The raw url of the resource.</param>
         <summary>Notify the host application of a resource request and allow the
             application to return the data.</summary>
         <returns>A <c>android.webkit.WebResourceResponse</c> containing the
@@ -1055,7 +1051,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebViewClient#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)" title="Reference documentation">Java documentation for <code>android.webkit.WebViewClient.shouldInterceptRequest(android.webkit.WebView, android.webkit.WebResourceRequest)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebViewClient#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.webkit.WebViewClient.shouldInterceptRequest(android.webkit.WebView, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1185,9 +1181,8 @@
         <Parameter Name="url" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="url">The url to be loaded.</param>
         <param name="view">The WebView that is initiating the callback.</param>
-        <param name="request">Object containing the details of the request.</param>
+        <param name="url">The URL to be loaded.</param>
         <summary>Give the host application a chance to take control when a URL is about to be loaded in the
             current WebView.</summary>
         <returns>
@@ -1195,7 +1190,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/webkit/WebViewClient#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)" title="Reference documentation">Java documentation for <code>android.webkit.WebViewClient.shouldOverrideUrlLoading(android.webkit.WebView, android.webkit.WebResourceRequest)</code>.</a>
+              <a href="https://developer.android.com/reference/android/webkit/WebViewClient#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.webkit.WebViewClient.shouldOverrideUrlLoading(android.webkit.WebView, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/AbsListView.xml b/docs/Mono.Android/en/Android.Widget/AbsListView.xml
index 2fdd832328..1ccee8318a 100644
--- a/docs/Mono.Android/en/Android.Widget/AbsListView.xml
+++ b/docs/Mono.Android/en/Android.Widget/AbsListView.xml
@@ -2117,23 +2117,15 @@
         <ReturnType>Android.Graphics.Drawables.Drawable</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resID">A Drawable resource to use as the selection highlight.</param>
         <summary>Returns the selector <c>android.graphics.drawable.Drawable</c> that is used to draw the
-            selection in the list. -or- Set a Drawable that should be used to highlight the currently selected item.</summary>
+            selection in the list.</summary>
         <value>the drawable used to display the selector</value>
         <remarks>
-          <para>Property getter documentation:</para>
           <para>
             <format type="text/html">
               <a href="https://developer.android.com/reference/android/widget/AbsListView#getSelector()" title="Reference documentation">Java documentation for <code>android.widget.AbsListView.getSelector()</code>.</a>
             </format>
           </para>
-          <para>Property setter documentation:</para>
-          <para>
-            <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AbsListView#setSelector(int)" title="Reference documentation">Java documentation for <code>android.widget.AbsListView.setSelector(int)</code>.</a>
-            </format>
-          </para>
           <para>
                     Portions of this page are modifications based on work created and shared by the 
                     <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
@@ -2981,15 +2973,14 @@
         <Parameter Name="boundPosition" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="boundPosition">Do not scroll if it would move this adapter
-          position out of view.
-</param>
         <param name="position">Scroll to this adapter position.</param>
+        <param name="boundPosition">Do not scroll if it would move this adapter
+                     position out of view.</param>
         <summary>Smoothly scroll to the specified adapter position.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AbsListView#smoothScrollToPosition(int)" title="Reference documentation">Java documentation for <code>android.widget.AbsListView.smoothScrollToPosition(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/AbsListView#smoothScrollToPosition(int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.AbsListView.smoothScrollToPosition(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3069,16 +3060,15 @@
         <Parameter Name="duration" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="duration">Number of milliseconds to use for the scroll
-</param>
         <param name="position">Position to scroll to</param>
         <param name="offset">Desired distance in pixels of &lt;code&gt;position&lt;/code&gt; from the top
                           of the view when scrolling is finished</param>
+        <param name="duration">Number of milliseconds to use for the scroll</param>
         <summary>Smoothly scroll to the specified adapter position.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AbsListView#smoothScrollToPositionFromTop(int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.AbsListView.smoothScrollToPositionFromTop(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/AbsListView#smoothScrollToPositionFromTop(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.AbsListView.smoothScrollToPositionFromTop(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/AdapterView.xml b/docs/Mono.Android/en/Android.Widget/AdapterView.xml
index 6f014597cd..eb1e297ad1 100644
--- a/docs/Mono.Android/en/Android.Widget/AdapterView.xml
+++ b/docs/Mono.Android/en/Android.Widget/AdapterView.xml
@@ -781,7 +781,6 @@
         <ReturnType>Android.Widget.AdapterView+IOnItemClickListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="listener">The callback that will be invoked.</param>
         <summary>Register a callback to be invoked when an item in this AdapterView has
             been clicked.</summary>
         <value>The callback to be invoked with an item in this AdapterView has
@@ -832,7 +831,6 @@
         <ReturnType>Android.Widget.AdapterView+IOnItemLongClickListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="listener">The callback that will run</param>
         <summary>Register a callback to be invoked when an item in this AdapterView has
             been clicked and held</summary>
         <value>The callback to be invoked with an item in this AdapterView has
@@ -883,7 +881,6 @@
         <ReturnType>Android.Widget.AdapterView+IOnItemSelectedListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="listener">The callback that will run</param>
         <summary>Register a callback to be invoked when an item in this AdapterView has
             been selected.</summary>
         <value>To be added.</value>
diff --git a/docs/Mono.Android/en/Android.Widget/AdapterViewAnimator.xml b/docs/Mono.Android/en/Android.Widget/AdapterViewAnimator.xml
index 1dca893557..e701e9ebc0 100644
--- a/docs/Mono.Android/en/Android.Widget/AdapterViewAnimator.xml
+++ b/docs/Mono.Android/en/Android.Widget/AdapterViewAnimator.xml
@@ -830,12 +830,11 @@
       <Docs>
         <param name="context">The application's environment.</param>
         <param name="resourceID">The resource id of the animation.</param>
-        <param name="inAnimation">The animation started when a View enters the screen.</param>
         <summary>Specifies the animation used to animate a View that enters the screen.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AdapterViewAnimator#setInAnimation(android.animation.ObjectAnimator)" title="Reference documentation">Java documentation for <code>android.widget.AdapterViewAnimator.setInAnimation(android.animation.ObjectAnimator)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/AdapterViewAnimator#setInAnimation(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.AdapterViewAnimator.setInAnimation(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -875,12 +874,11 @@
       <Docs>
         <param name="context">The application's environment.</param>
         <param name="resourceID">The resource id of the animation.</param>
-        <param name="outAnimation">The animation started when a View exit the screen.</param>
         <summary>Specifies the animation used to animate a View that exit the screen.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AdapterViewAnimator#setOutAnimation(android.animation.ObjectAnimator)" title="Reference documentation">Java documentation for <code>android.widget.AdapterViewAnimator.setOutAnimation(android.animation.ObjectAnimator)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/AdapterViewAnimator#setOutAnimation(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.AdapterViewAnimator.setOutAnimation(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ArrayAdapter.xml b/docs/Mono.Android/en/Android.Widget/ArrayAdapter.xml
index 4028b709b0..0e72bd528f 100644
--- a/docs/Mono.Android/en/Android.Widget/ArrayAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/ArrayAdapter.xml
@@ -148,15 +148,15 @@
         <Parameter Name="objects" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="objects">To be added.</param>
         <param name="context">The current context.</param>
         <param name="resource">The resource ID for a layout file containing a TextView to use when
                             instantiating views.</param>
-        <summary>Constructor</summary>
+        <param name="objects">The objects to represent in the ListView.</param>
+        <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -189,15 +189,15 @@
         <Parameter Name="objects" Type="System.Collections.IList" />
       </Parameters>
       <Docs>
-        <param name="objects">To be added.</param>
         <param name="context">The current context.</param>
         <param name="resource">The resource ID for a layout file containing a TextView to use when
                             instantiating views.</param>
+        <param name="objects">The objects to represent in the ListView.</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int,%20java.util.List)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -230,15 +230,15 @@
         <Parameter Name="textViewResourceId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="textViewResourceId">To be added.</param>
         <param name="context">The current context.</param>
-        <param name="resource">The resource ID for a layout file containing a TextView to use when
+        <param name="resource">The resource ID for a layout file containing a layout to use when
                             instantiating views.</param>
+        <param name="textViewResourceId">The id of the TextView within the layout resource to be populated</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -273,16 +273,16 @@
         <Parameter Name="objects" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="textViewResourceId">To be added.</param>
-        <param name="objects">To be added.</param>
         <param name="context">The current context.</param>
-        <param name="resource">The resource ID for a layout file containing a TextView to use when
+        <param name="resource">The resource ID for a layout file containing a layout to use when
                             instantiating views.</param>
-        <summary>Constructor</summary>
+        <param name="textViewResourceId">The id of the TextView within the layout resource to be populated</param>
+        <param name="objects">The objects to represent in the ListView.</param>
+        <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int,%20int,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int, int, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -316,16 +316,16 @@
         <Parameter Name="objects" Type="System.Collections.IList" />
       </Parameters>
       <Docs>
-        <param name="textViewResourceId">To be added.</param>
-        <param name="objects">To be added.</param>
         <param name="context">The current context.</param>
-        <param name="resource">The resource ID for a layout file containing a TextView to use when
+        <param name="resource">The resource ID for a layout file containing a layout to use when
                             instantiating views.</param>
+        <param name="textViewResourceId">The id of the TextView within the layout resource to be populated</param>
+        <param name="objects">The objects to represent in the ListView.</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#ArrayAdapter(android.content.Context,%20int,%20int,%20java.util.List)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.ArrayAdapter(android.content.Context, int, int, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -410,7 +410,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#addAll(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.addAll(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#addAll(java.lang.Object[])" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.addAll(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -444,13 +444,12 @@
         <Parameter Name="collection" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="collection">To be added.</param>
-        <param name="items">The items to add at the end of the array.</param>
-        <summary>Adds the specified items at the end of the array.</summary>
+        <param name="collection">The Collection to add at the end of the array.</param>
+        <summary>Adds the specified Collection at the end of the array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#addAll(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.addAll(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ArrayAdapter#addAll(java.util.Collection)" title="Reference documentation">Java documentation for <code>android.widget.ArrayAdapter.addAll(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -638,8 +637,6 @@
         <ReturnType>Android.Content.Res.Resources+Theme</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="theme">the theme against which to inflate drop-down views or
-                         <c>null</c> to use the theme from the adapter's context</param>
         <summary>Sets the <c>Resources.Theme</c> against which drop-down views are
             inflated.</summary>
         <value>To be added.</value>
diff --git a/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml b/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml
index aca08e1268..4b96c8cbd0 100644
--- a/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml
+++ b/docs/Mono.Android/en/Android.Widget/AutoCompleteTextView.xml
@@ -102,14 +102,15 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new auto-complete text view with the given context's theme.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <summary>Constructs a new auto-complete text view with the given context's theme
+            and the supplied attribute set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AutoCompleteTextView#AutoCompleteTextView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.AutoCompleteTextView.AutoCompleteTextView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/AutoCompleteTextView#AutoCompleteTextView(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.AutoCompleteTextView.AutoCompleteTextView(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -166,15 +167,19 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new auto-complete text view with the given context's theme.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                                reference to a style resource that supplies default
+                                values for the view. Can be 0 to not look for
+                                defaults.</param>
+        <summary>Constructs a new auto-complete text view with the given context's theme,
+            the supplied attribute set, and default style attribute.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AutoCompleteTextView#AutoCompleteTextView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.AutoCompleteTextView.AutoCompleteTextView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/AutoCompleteTextView#AutoCompleteTextView(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.AutoCompleteTextView.AutoCompleteTextView(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -209,16 +214,23 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new auto-complete text view with the given context's theme.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                                reference to a style resource that supplies default
+                                values for the view. Can be 0 to not look for
+                                defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                               supplies default values for the view, used only if
+                               defStyleAttr is 0 or can not be found in the theme.
+                               Can be 0 to not look for defaults.</param>
+        <summary>Constructs a new auto-complete text view with the given context's theme,
+            the supplied attribute set, and default styles.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/AutoCompleteTextView#AutoCompleteTextView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.AutoCompleteTextView.AutoCompleteTextView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/AutoCompleteTextView#AutoCompleteTextView(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.AutoCompleteTextView.AutoCompleteTextView(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -253,12 +265,12 @@
         <Parameter Name="popupTheme" Type="Android.Content.Res.Resources+Theme" />
       </Parameters>
       <Docs>
+        <param name="context">The Context the view is running in, through which it can
+                           access the current theme, resources, etc.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="defStyleRes">To be added.</param>
         <param name="popupTheme">To be added.</param>
-        <param name="context">The Context the view is running in, through which it can
-                           access the current theme, resources, etc.</param>
         <summary>Constructs a new auto-complete text view with the given context's theme.</summary>
         <remarks>
           <para>
@@ -1369,7 +1381,6 @@
         <ReturnType>Android.Widget.AdapterView+IOnItemClickListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="l">the item click listener</param>
         <summary>Returns the listener that is notified whenever the user clicks an item
             in the drop down list. -or- Sets the listener that will be notified when the user clicks an item
             in the drop down list.</summary>
@@ -1420,7 +1431,6 @@
         <ReturnType>Android.Widget.AdapterView+IOnItemSelectedListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="l">the item selected listener</param>
         <summary>Returns the listener that is notified whenever the user selects an
             item in the drop down list. -or- Sets the listener that will be notified when the user selects an item
             in the drop down list.</summary>
@@ -2169,7 +2179,6 @@
         <ReturnType>Android.Widget.AutoCompleteTextView+IValidator</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="validator">The validator used to validate the text entered in this widget.</param>
         <summary>Returns the Validator set with <c>#setValidator</c>,
             or &lt;code&gt;null&lt;/code&gt; if it was not set. -or- Sets the validator used to perform text validation.</summary>
         <value>To be added.</value>
diff --git a/docs/Mono.Android/en/Android.Widget/Button.xml b/docs/Mono.Android/en/Android.Widget/Button.xml
index 7a3f9e81a6..d747f287ff 100644
--- a/docs/Mono.Android/en/Android.Widget/Button.xml
+++ b/docs/Mono.Android/en/Android.Widget/Button.xml
@@ -93,14 +93,15 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="context">The Context the Button is running in, through which it can
+        <param name="context">The Context the view is running in, through which it can
                    access the current theme, resources, etc.</param>
-        <summary>Simple constructor to use when creating a button from code.</summary>
+        <param name="attrs">The attributes of the XML Button tag being used to inflate the view.</param>
+        <summary>
+          <c>LayoutInflater</c> calls this constructor when inflating a Button from XML.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Button#Button(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Button.Button(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Button#Button(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.Button.Button(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -157,15 +158,19 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The Context the Button is running in, through which it can
                    access the current theme, resources, etc.</param>
-        <summary>Simple constructor to use when creating a button from code.</summary>
+        <param name="attrs">The attributes of the XML Button tag that is inflating the view.</param>
+        <param name="defStyleAttr">The resource identifier of an attribute in the current theme
+                   whose value is the the resource id of a style. The specified style’s
+                   attribute values serve as default values for the button. Set this parameter
+                   to 0 to avoid use of default values.</param>
+        <summary>This constructor allows a Button subclass to use its own class-specific base style from a
+            theme attribute when inflating.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Button#Button(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Button.Button(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Button#Button(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Button.Button(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -200,16 +205,23 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
         <param name="context">The Context the Button is running in, through which it can
                    access the current theme, resources, etc.</param>
-        <summary>Simple constructor to use when creating a button from code.</summary>
+        <param name="attrs">The attributes of the XML Button tag that is inflating the view.</param>
+        <param name="defStyleAttr">The resource identifier of an attribute in the current theme
+                   whose value is the the resource id of a style. The specified style’s
+                   attribute values serve as default values for the button. Set this parameter
+                   to 0 to avoid use of default values.</param>
+        <param name="defStyleRes">The identifier of a style resource that
+                   supplies default values for the button, used only if
+                   defStyleAttr is 0 or cannot be found in the theme.
+                   Set this parameter to 0 to avoid use of default values.</param>
+        <summary>This constructor allows a Button subclass to use its own class-specific base style from
+            either a theme attribute or style resource when inflating.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Button#Button(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Button.Button(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Button#Button(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Button.Button(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/CalendarView.xml b/docs/Mono.Android/en/Android.Widget/CalendarView.xml
index 6cf63e6821..e1f43e3eea 100644
--- a/docs/Mono.Android/en/Android.Widget/CalendarView.xml
+++ b/docs/Mono.Android/en/Android.Widget/CalendarView.xml
@@ -602,7 +602,7 @@
         <ReturnType>Android.Graphics.Drawables.Drawable</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resourceId">The vertical bar drawable resource id.</param>
+        <param name="drawable">The vertical bar drawable.</param>
         <summary>Gets the drawable for the vertical bar shown at the beginning and at
             the end of the selected date. -or- Sets the drawable for the vertical bar shown at the beginning and at
             the end of the selected date.</summary>
@@ -617,7 +617,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/CalendarView#setSelectedDateVerticalBar(int)" title="Reference documentation">Java documentation for <code>android.widget.CalendarView.setSelectedDateVerticalBar(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/CalendarView#setSelectedDateVerticalBar(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.CalendarView.setSelectedDateVerticalBar(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -707,15 +707,15 @@
         <Parameter Name="center" Type="System.Boolean" />
       </Parameters>
       <Docs>
+        <param name="date">The date.</param>
         <param name="animate">Whether to animate the scroll to the current date.</param>
         <param name="center">Whether to center the current date even if it is already visible.</param>
-        <param name="date">The selected date.</param>
         <summary>Sets the selected date in milliseconds since January 1, 1970 00:00:00 in
             <c>TimeZone#getDefault()</c> time zone.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/CalendarView#setDate(long)" title="Reference documentation">Java documentation for <code>android.widget.CalendarView.setDate(long)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/CalendarView#setDate(long,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.CalendarView.setDate(long, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/CheckedTextView.xml b/docs/Mono.Android/en/Android.Widget/CheckedTextView.xml
index d9f07a4371..d2ebc53d64 100644
--- a/docs/Mono.Android/en/Android.Widget/CheckedTextView.xml
+++ b/docs/Mono.Android/en/Android.Widget/CheckedTextView.xml
@@ -413,8 +413,6 @@
         <ReturnType>Android.Graphics.PorterDuff+Mode</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="tintMode">the blending mode used to apply the tint, may be
-                            <c>null</c> to clear tint</param>
         <summary>Returns the blending mode used to apply the tint to the check mark
             drawable, if specified. -or- Specifies the blending mode used to apply the tint specified by
             <c>#setCheckMarkTintList(ColorStateList)</c> to the check mark
@@ -533,13 +531,11 @@
       </Parameters>
       <Docs>
         <param name="d">the drawable to use for the check mark</param>
-        <param name="resId">the resource identifier of drawable to use as the check
-                         mark</param>
-        <summary>Sets the check mark to the drawable with the specified resource ID.</summary>
+        <summary>Set the check mark to the specified drawable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/CheckedTextView#setCheckMarkDrawable(int)" title="Reference documentation">Java documentation for <code>android.widget.CheckedTextView.setCheckMarkDrawable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/CheckedTextView#setCheckMarkDrawable(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.CheckedTextView.setCheckMarkDrawable(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Chronometer.xml b/docs/Mono.Android/en/Android.Widget/Chronometer.xml
index 4b18f6379f..3032cc8554 100644
--- a/docs/Mono.Android/en/Android.Widget/Chronometer.xml
+++ b/docs/Mono.Android/en/Android.Widget/Chronometer.xml
@@ -94,11 +94,11 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
-        <summary>Initialize this Chronometer object.</summary>
+        <summary>Initialize with standard view layout information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Chronometer#Chronometer(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Chronometer.Chronometer(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Chronometer#Chronometer(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.Chronometer.Chronometer(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -158,11 +158,11 @@
         <param name="context">To be added.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
-        <summary>Initialize this Chronometer object.</summary>
+        <summary>Initialize with standard view layout information and style.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Chronometer#Chronometer(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Chronometer.Chronometer(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Chronometer#Chronometer(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Chronometer.Chronometer(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -473,7 +473,6 @@
         <ReturnType>Android.Widget.Chronometer+IOnChronometerTickListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="listener">The listener.</param>
         <summary>Sets the listener to be called when the chronometer changes.</summary>
         <value>The listener (may be null) that is listening for chronometer change
                     events.</value>
diff --git a/docs/Mono.Android/en/Android.Widget/CompoundButton.xml b/docs/Mono.Android/en/Android.Widget/CompoundButton.xml
index 6da6928694..b0113b089b 100644
--- a/docs/Mono.Android/en/Android.Widget/CompoundButton.xml
+++ b/docs/Mono.Android/en/Android.Widget/CompoundButton.xml
@@ -491,14 +491,12 @@
         <Parameter Name="drawable" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="drawable">To be added.</param>
-        <param name="resId">the resource identifier of the drawable</param>
-        <summary>Sets a drawable as the compound button image given its resource
-            identifier.</summary>
+        <param name="drawable">the drawable to set</param>
+        <summary>Sets a drawable as the compound button image.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/CompoundButton#setButtonDrawable(int)" title="Reference documentation">Java documentation for <code>android.widget.CompoundButton.setButtonDrawable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/CompoundButton#setButtonDrawable(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.CompoundButton.setButtonDrawable(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/CursorAdapter.xml b/docs/Mono.Android/en/Android.Widget/CursorAdapter.xml
index e645f8170a..51fd1b3fb6 100644
--- a/docs/Mono.Android/en/Android.Widget/CursorAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/CursorAdapter.xml
@@ -152,14 +152,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
         <param name="c">The cursor from which to get the data.</param>
         <param name="context">The context</param>
-        <summary>Constructor that always enables auto-requery.</summary>
+        <param name="flags">Flags used to determine the behavior of the adapter; may
+            be any combination of <c>#FLAG_AUTO_REQUERY</c> and
+            <c>#FLAG_REGISTER_CONTENT_OBSERVER</c>.</param>
+        <summary>Recommended constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/CursorAdapter#CursorAdapter(android.content.Context,%20android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.widget.CursorAdapter.CursorAdapter(android.content.Context, android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/CursorAdapter#CursorAdapter(android.content.Context,%20android.database.Cursor,%20int)" title="Reference documentation">Java documentation for <code>android.widget.CursorAdapter.CursorAdapter(android.content.Context, android.database.Cursor, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -193,14 +195,16 @@
         <Parameter Name="autoRequery" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="autoRequery">To be added.</param>
         <param name="c">The cursor from which to get the data.</param>
         <param name="context">The context</param>
-        <summary>Constructor that always enables auto-requery.</summary>
+        <param name="autoRequery">If true the adapter will call requery() on the
+                               cursor whenever it changes so the most recent
+                               data is always displayed.  Using true here is discouraged.</param>
+        <summary>Constructor that allows control over auto-requery.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/CursorAdapter#CursorAdapter(android.content.Context,%20android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.widget.CursorAdapter.CursorAdapter(android.content.Context, android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/CursorAdapter#CursorAdapter(android.content.Context,%20android.database.Cursor,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.CursorAdapter.CursorAdapter(android.content.Context, android.database.Cursor, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -476,8 +480,6 @@
         <ReturnType>Android.Content.Res.Resources+Theme</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="theme">the theme against which to inflate drop-down views or
-                         <c>null</c> to use the theme from the adapter's context</param>
         <summary>Sets the <c>Resources.Theme</c> against which drop-down views are
             inflated.</summary>
         <value>To be added.</value>
diff --git a/docs/Mono.Android/en/Android.Widget/CursorTreeAdapter.xml b/docs/Mono.Android/en/Android.Widget/CursorTreeAdapter.xml
index 35050fcb58..f4ddf92a56 100644
--- a/docs/Mono.Android/en/Android.Widget/CursorTreeAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/CursorTreeAdapter.xml
@@ -132,14 +132,16 @@
         <Parameter Name="autoRequery" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="autoRequery">To be added.</param>
         <param name="cursor">The cursor from which to get the data for the groups.</param>
+        <param name="context">The context</param>
+        <param name="autoRequery">If true the adapter will call <c>Cursor#requery()</c>
+                   on the cursor whenever it changes so the most recent data is
+                   always displayed.</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/CursorTreeAdapter#CursorTreeAdapter(android.database.Cursor,%20android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.CursorTreeAdapter.CursorTreeAdapter(android.database.Cursor, android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/CursorTreeAdapter#CursorTreeAdapter(android.database.Cursor,%20android.content.Context,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.CursorTreeAdapter.CursorTreeAdapter(android.database.Cursor, android.content.Context, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml b/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml
index 948788de9f..78e99105d1 100644
--- a/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml
+++ b/docs/Mono.Android/en/Android.Widget/EdgeEffect.xml
@@ -93,13 +93,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">Context used to provide theming and resource information for the EdgeEffect</param>
+        <param name="attrs">The attributes of the XML tag that is inflating the view</param>
         <summary>Construct a new EdgeEffect with a theme appropriate for the provided context.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/EdgeEffect#EdgeEffect(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.EdgeEffect.EdgeEffect(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/EdgeEffect#EdgeEffect(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.EdgeEffect.EdgeEffect(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -569,18 +569,17 @@
         <Parameter Name="displacement" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="displacement">The displacement from the starting side of the effect of the point
-                     initiating the pull. In the case of touch this is the finger position.
-                     Values may be from 0-1.
-</param>
         <param name="deltaDistance">Change in distance since the last call. Values may be 0 (no change) to
                                  1.f (full length of the view) or negative values to express change
                                  back toward the edge reached to initiate the effect.</param>
+        <param name="displacement">The displacement from the starting side of the effect of the point
+                                initiating the pull. In the case of touch this is the finger position.
+                                Values may be from 0-1.</param>
         <summary>A view should call this when content is pulled away from an edge by the user.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/EdgeEffect#onPull(float)" title="Reference documentation">Java documentation for <code>android.widget.EdgeEffect.onPull(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/EdgeEffect#onPull(float,%20float)" title="Reference documentation">Java documentation for <code>android.widget.EdgeEffect.onPull(float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/EditText.xml b/docs/Mono.Android/en/Android.Widget/EditText.xml
index 4f75630e73..29fff2947a 100644
--- a/docs/Mono.Android/en/Android.Widget/EditText.xml
+++ b/docs/Mono.Android/en/Android.Widget/EditText.xml
@@ -358,11 +358,11 @@
       <Docs>
         <param name="start">To be added.</param>
         <param name="stop">To be added.</param>
-        <summary>Convenience for <c>Selection#setSelection(Spannable, int)</c>.</summary>
+        <summary>Convenience for <c>Selection#setSelection(Spannable, int, int)</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/EditText#setSelection(int)" title="Reference documentation">Java documentation for <code>android.widget.EditText.setSelection(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/EditText#setSelection(int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.EditText.setSelection(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ExpandableListView.xml b/docs/Mono.Android/en/Android.Widget/ExpandableListView.xml
index 858bbb8733..5a2797e7d1 100644
--- a/docs/Mono.Android/en/Android.Widget/ExpandableListView.xml
+++ b/docs/Mono.Android/en/Android.Widget/ExpandableListView.xml
@@ -387,15 +387,15 @@
         <Parameter Name="animate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="animate">true if the expanding group should be animated in</param>
         <param name="groupPos">the group to be expanded</param>
+        <param name="animate">true if the expanding group should be animated in</param>
         <summary>Expand a group in the grouped list view</summary>
         <returns>True if the group was expanded, false otherwise (if the group
                     was already expanded, this will return false)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ExpandableListView#expandGroup(int)" title="Reference documentation">Java documentation for <code>android.widget.ExpandableListView.expandGroup(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ExpandableListView#expandGroup(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.ExpandableListView.expandGroup(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Filter.xml b/docs/Mono.Android/en/Android.Widget/Filter.xml
index 0def3af98f..d8b8459e6b 100644
--- a/docs/Mono.Android/en/Android.Widget/Filter.xml
+++ b/docs/Mono.Android/en/Android.Widget/Filter.xml
@@ -263,8 +263,8 @@
         <Parameter Name="listener" Type="Android.Widget.Filter+IFilterListener" />
       </Parameters>
       <Docs>
-        <param name="listener">a listener notified upon completion of the operation</param>
         <param name="constraint">the constraint used to filter the data</param>
+        <param name="listener">a listener notified upon completion of the operation</param>
         <summary>Starts an asynchronous filtering operation.</summary>
         <remarks>
           <para>
@@ -302,8 +302,8 @@
         <Parameter Name="listener" Type="Android.Widget.Filter+IFilterListener" />
       </Parameters>
       <Docs>
-        <param name="listener">To be added.</param>
         <param name="constraint">the constraint used to filter the data</param>
+        <param name="listener">To be added.</param>
         <summary>Starts an asynchronous filtering operation.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/GridLayout.xml b/docs/Mono.Android/en/Android.Widget/GridLayout.xml
index 9afd62f4e9..7d2dc6c735 100644
--- a/docs/Mono.Android/en/Android.Widget/GridLayout.xml
+++ b/docs/Mono.Android/en/Android.Widget/GridLayout.xml
@@ -728,8 +728,8 @@
         <Parameter Name="alignment" Type="Android.Widget.GridLayout+Alignment" />
       </Parameters>
       <Docs>
-        <param name="alignment">the alignment</param>
         <param name="start">the start index</param>
+        <param name="alignment">the alignment</param>
         <summary>Return a Spec, <c>spec</c>, where:
             &lt;ul&gt;
                 &lt;li&gt; <c>spec.span = [start, start + 1]</c>&lt;/li&gt;
@@ -775,8 +775,8 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">the size</param>
         <param name="start">the start index</param>
+        <param name="size">the size</param>
         <summary>Return a Spec, <c>spec</c>, where:
             &lt;ul&gt;
                 &lt;li&gt; <c>spec.span = [start, start + 1]</c>&lt;/li&gt;
@@ -822,9 +822,9 @@
         <Parameter Name="weight" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="start">the start index</param>
         <param name="weight">the weight
 </param>
-        <param name="start">the start index</param>
         <summary>Return a Spec, <c>spec</c>, where:
             &lt;ul&gt;
                 &lt;li&gt; <c>spec.span = [start, start + 1]</c>&lt;/li&gt;
@@ -869,10 +869,10 @@
         <Parameter Name="weight" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="start">the start index</param>
         <param name="alignment">the alignment</param>
         <param name="weight">the weight
 </param>
-        <param name="start">the start index</param>
         <summary>Return a Spec, <c>spec</c>, where:
             &lt;ul&gt;
                 &lt;li&gt; <c>spec.span = [start, start + 1]</c>&lt;/li&gt;
@@ -917,10 +917,10 @@
         <Parameter Name="alignment" Type="Android.Widget.GridLayout+Alignment" />
       </Parameters>
       <Docs>
+        <param name="start">the start index</param>
         <param name="size">the size</param>
         <param name="alignment">the alignment
 </param>
-        <param name="start">the start index</param>
         <summary>Return a Spec, <c>spec</c>, where:
             &lt;ul&gt;
                 &lt;li&gt; <c>spec.span = [start, start + 1]</c>&lt;/li&gt;
@@ -966,10 +966,10 @@
         <Parameter Name="weight" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="start">the start index</param>
         <param name="size">the size</param>
         <param name="weight">the weight
 </param>
-        <param name="start">the start index</param>
         <summary>Return a Spec, <c>spec</c>, where:
             &lt;ul&gt;
                 &lt;li&gt; <c>spec.span = [start, start + 1]</c>&lt;/li&gt;
@@ -1015,11 +1015,11 @@
         <Parameter Name="weight" Type="System.Single" />
       </Parameters>
       <Docs>
+        <param name="start">the start index</param>
         <param name="size">the size</param>
         <param name="alignment">the alignment</param>
         <param name="weight">the weight
 </param>
-        <param name="start">the start index</param>
         <summary>Return a Spec, <c>spec</c>, where:
             &lt;ul&gt;
                 &lt;li&gt; <c>spec.span = [start, start + 1]</c>&lt;/li&gt;
diff --git a/docs/Mono.Android/en/Android.Widget/ImageSwitcher.xml b/docs/Mono.Android/en/Android.Widget/ImageSwitcher.xml
index 95b1504064..b23b6f5c25 100644
--- a/docs/Mono.Android/en/Android.Widget/ImageSwitcher.xml
+++ b/docs/Mono.Android/en/Android.Widget/ImageSwitcher.xml
@@ -93,13 +93,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="context">the application's environment</param>
-        <summary>Creates a new empty ImageSwitcher.</summary>
+        <param name="context">the application environment</param>
+        <param name="attrs">a collection of attributes</param>
+        <summary>Creates a new empty ImageSwitcher for the given context and with the
+            specified set attributes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ImageSwitcher#ImageSwitcher(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.ImageSwitcher.ImageSwitcher(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ImageSwitcher#ImageSwitcher(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.ImageSwitcher.ImageSwitcher(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ImageView.xml b/docs/Mono.Android/en/Android.Widget/ImageView.xml
index 2491b32e43..88be59cdbe 100644
--- a/docs/Mono.Android/en/Android.Widget/ImageView.xml
+++ b/docs/Mono.Android/en/Android.Widget/ImageView.xml
@@ -1092,12 +1092,11 @@
       </Parameters>
       <Docs>
         <param name="cf">the colorfilter to apply (may be null)</param>
-        <param name="color">Color tint to apply.</param>
-        <summary>Set a tinting option for the image.</summary>
+        <summary>Apply an arbitrary colorfilter to the image.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ImageView#setColorFilter(int)" title="Reference documentation">Java documentation for <code>android.widget.ImageView.setColorFilter(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ImageView#setColorFilter(android.graphics.ColorFilter)" title="Reference documentation">Java documentation for <code>android.widget.ImageView.setColorFilter(android.graphics.ColorFilter)</code>.</a>
             </format>
           </para>
           <para>
@@ -1134,9 +1133,9 @@
         <Parameter Name="mode" Type="Android.Graphics.PorterDuff+Mode" />
       </Parameters>
       <Docs>
+        <param name="color">Color tint to apply.</param>
         <param name="mode">How to apply the color.  The standard mode is
  <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=PorterDuff Mode SRC_ATOP;scope=Xamarin" title="PorterDuff Mode SRC_ATOP">PorterDuff Mode SRC_ATOP</a></format></param>
-        <param name="color">Color tint to apply.</param>
         <summary>Set a tinting option for the image.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ListPopupWindow.xml b/docs/Mono.Android/en/Android.Widget/ListPopupWindow.xml
index 8c2e8e8d50..2c3d190b3a 100644
--- a/docs/Mono.Android/en/Android.Widget/ListPopupWindow.xml
+++ b/docs/Mono.Android/en/Android.Widget/ListPopupWindow.xml
@@ -93,13 +93,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">Context used for contained views.</param>
+        <param name="attrs">Attributes from inflating parent views used to style the popup.</param>
         <summary>Create a new, empty popup window capable of displaying items from a ListAdapter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ListPopupWindow#ListPopupWindow(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.ListPopupWindow.ListPopupWindow(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ListPopupWindow#ListPopupWindow(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.ListPopupWindow.ListPopupWindow(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,14 +156,14 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">Context used for contained views.</param>
+        <param name="attrs">Attributes from inflating parent views used to style the popup.</param>
+        <param name="defStyleAttr">Default style attribute to use for popup content.</param>
         <summary>Create a new, empty popup window capable of displaying items from a ListAdapter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ListPopupWindow#ListPopupWindow(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.ListPopupWindow.ListPopupWindow(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ListPopupWindow#ListPopupWindow(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ListPopupWindow.ListPopupWindow(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -198,15 +198,15 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
         <param name="context">Context used for contained views.</param>
+        <param name="attrs">Attributes from inflating parent views used to style the popup.</param>
+        <param name="defStyleAttr">Style attribute to read for default styling of popup content.</param>
+        <param name="defStyleRes">Style resource ID to use for default styling of popup content.</param>
         <summary>Create a new, empty popup window capable of displaying items from a ListAdapter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ListPopupWindow#ListPopupWindow(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.ListPopupWindow.ListPopupWindow(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ListPopupWindow#ListPopupWindow(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ListPopupWindow.ListPopupWindow(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ListView.xml b/docs/Mono.Android/en/Android.Widget/ListView.xml
index d81979a170..73bea0d759 100644
--- a/docs/Mono.Android/en/Android.Widget/ListView.xml
+++ b/docs/Mono.Android/en/Android.Widget/ListView.xml
@@ -303,15 +303,14 @@
         <Parameter Name="isSelectable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="data">Data to associate with this view</param>
-        <param name="isSelectable">true if the footer view can be selected
-</param>
         <param name="v">The view to add.</param>
+        <param name="data">Data to associate with this view</param>
+        <param name="isSelectable">true if the footer view can be selected</param>
         <summary>Add a fixed view to appear at the bottom of the list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ListView#addFooterView(android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.ListView.addFooterView(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ListView#addFooterView(android.view.View,%20java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.ListView.addFooterView(android.view.View, java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -388,15 +387,14 @@
         <Parameter Name="isSelectable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="data">Data to associate with this view</param>
-        <param name="isSelectable">whether the item is selectable
-</param>
         <param name="v">The view to add.</param>
+        <param name="data">Data to associate with this view</param>
+        <param name="isSelectable">whether the item is selectable</param>
         <summary>Add a fixed view to appear at the top of the list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ListView#addHeaderView(android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.ListView.addHeaderView(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ListView#addHeaderView(android.view.View,%20java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.ListView.addHeaderView(android.view.View, java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Magnifier.xml b/docs/Mono.Android/en/Android.Widget/Magnifier.xml
index 9ee160135d..d848713ae5 100644
--- a/docs/Mono.Android/en/Android.Widget/Magnifier.xml
+++ b/docs/Mono.Android/en/Android.Widget/Magnifier.xml
@@ -499,15 +499,16 @@
         <Parameter Name="magnifierCenterY" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="magnifierCenterX">To be added.</param>
-        <param name="magnifierCenterY">To be added.</param>
-        <param name="sourceCenterX">horizontal coordinate of the source center, relative to the view</param>
+        <param name="sourceCenterX">horizontal coordinate of the source center relative to the view</param>
         <param name="sourceCenterY">vertical coordinate of the source center, relative to the view</param>
-        <summary>Shows the magnifier on the screen.</summary>
+        <param name="magnifierCenterX">horizontal coordinate of the magnifier center, relative to the view</param>
+        <param name="magnifierCenterY">vertical coordinate of the magnifier center, relative to the view</param>
+        <summary>Shows the magnifier on the screen at a position that is independent from its content
+            position.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Magnifier#show(float,%20float)" title="Reference documentation">Java documentation for <code>android.widget.Magnifier.show(float, float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Magnifier#show(float,%20float,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.widget.Magnifier.show(float, float, float, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/MediaController.xml b/docs/Mono.Android/en/Android.Widget/MediaController.xml
index b65c5bb61a..ac4e50176e 100644
--- a/docs/Mono.Android/en/Android.Widget/MediaController.xml
+++ b/docs/Mono.Android/en/Android.Widget/MediaController.xml
@@ -480,13 +480,12 @@
       </Parameters>
       <Docs>
         <param name="timeout">The timeout in milliseconds. Use 0 to show
- the controller until hide() is called.
-</param>
+            the controller until hide() is called.</param>
         <summary>Show the controller on screen.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/MediaController#show()" title="Reference documentation">Java documentation for <code>android.widget.MediaController.show()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/MediaController#show(int)" title="Reference documentation">Java documentation for <code>android.widget.MediaController.show(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView.xml b/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView.xml
index 3d42d00fd9..1b68977089 100644
--- a/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView.xml
+++ b/docs/Mono.Android/en/Android.Widget/MultiAutoCompleteTextView.xml
@@ -243,14 +243,11 @@
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
         <param name="keyCode">To be added.</param>
-        <summary>Instead of filtering on the entire contents of the edit box,
-            this subclass method filters on the range from
-            <c>Tokenizer#findTokenStart</c> to <c>#getSelectionEnd</c>
-            if the length of that range meets or exceeds <c>#getThreshold</c>.</summary>
+        <summary>Starts filtering the content of the drop down list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/MultiAutoCompleteTextView#performFiltering(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.widget.MultiAutoCompleteTextView.performFiltering(java.lang.CharSequence, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/MultiAutoCompleteTextView#performFiltering(java.lang.CharSequence,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.MultiAutoCompleteTextView.performFiltering(java.lang.CharSequence, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -286,14 +283,11 @@
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
         <param name="keyCode">To be added.</param>
-        <summary>Instead of filtering on the entire contents of the edit box,
-            this subclass method filters on the range from
-            <c>Tokenizer#findTokenStart</c> to <c>#getSelectionEnd</c>
-            if the length of that range meets or exceeds <c>#getThreshold</c>.</summary>
+        <summary>Starts filtering the content of the drop down list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/MultiAutoCompleteTextView#performFiltering(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.widget.MultiAutoCompleteTextView.performFiltering(java.lang.CharSequence, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/MultiAutoCompleteTextView#performFiltering(java.lang.CharSequence,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.MultiAutoCompleteTextView.performFiltering(java.lang.CharSequence, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/NumberPicker.xml b/docs/Mono.Android/en/Android.Widget/NumberPicker.xml
index 8b7e50e377..3e3f4490cb 100644
--- a/docs/Mono.Android/en/Android.Widget/NumberPicker.xml
+++ b/docs/Mono.Android/en/Android.Widget/NumberPicker.xml
@@ -92,13 +92,13 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The application environment.</param>
+        <param name="attrs">A collection of attributes.</param>
         <summary>Create a new number picker.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/NumberPicker#NumberPicker(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.NumberPicker.NumberPicker(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/NumberPicker#NumberPicker(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.NumberPicker.NumberPicker(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,14 +155,16 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="context">The application environment.</param>
-        <summary>Create a new number picker.</summary>
+        <param name="context">the application environment.</param>
+        <param name="attrs">a collection of attributes.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <summary>Create a new number picker</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/NumberPicker#NumberPicker(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.NumberPicker.NumberPicker(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/NumberPicker#NumberPicker(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.NumberPicker.NumberPicker(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -197,15 +199,20 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
-        <param name="context">The application environment.</param>
-        <summary>Create a new number picker.</summary>
+        <param name="context">the application environment.</param>
+        <param name="attrs">a collection of attributes.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                   supplies default values for the view, used only if
+                   defStyleAttr is 0 or can not be found in the theme. Can be 0
+                   to not look for defaults.</param>
+        <summary>Create a new number picker</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/NumberPicker#NumberPicker(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.NumberPicker.NumberPicker(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/NumberPicker#NumberPicker(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.NumberPicker.NumberPicker(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/OverScroller.xml b/docs/Mono.Android/en/Android.Widget/OverScroller.xml
index 8572287056..5cc9590bc0 100644
--- a/docs/Mono.Android/en/Android.Widget/OverScroller.xml
+++ b/docs/Mono.Android/en/Android.Widget/OverScroller.xml
@@ -84,11 +84,21 @@
         <Parameter Name="interpolator" Type="Android.Views.Animations.IInterpolator" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="interpolator">To be added.</param>
+        <param name="context">The context of this application.</param>
+        <param name="interpolator">The scroll interpolator. If null, a default (viscous) interpolator will
+            be used.</param>
         <summary>Creates an OverScroller with flywheel enabled.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/OverScroller#OverScroller(android.content.Context,%20android.view.animation.Interpolator)" title="Reference documentation">Java documentation for <code>android.widget.OverScroller.OverScroller(android.content.Context, android.view.animation.Interpolator)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 9" />
       </Docs>
@@ -143,13 +153,26 @@
         <Parameter Name="bounceCoefficientY" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="interpolator">To be added.</param>
-        <param name="bounceCoefficientX">To be added.</param>
-        <param name="bounceCoefficientY">To be added.</param>
+        <param name="context">The context of this application.</param>
+        <param name="interpolator">The scroll interpolator. If null, a default (viscous) interpolator will
+            be used.</param>
+        <param name="bounceCoefficientX">A value between 0 and 1 that will determine the proportion of the
+            velocity which is preserved in the bounce when the horizontal edge is reached. A null value
+            means no bounce. This behavior is no longer supported and this coefficient has no effect.</param>
+        <param name="bounceCoefficientY">Same as bounceCoefficientX but for the vertical direction. This
+            behavior is no longer supported and this coefficient has no effect.</param>
         <summary>Creates an OverScroller with flywheel enabled.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/OverScroller#OverScroller(android.content.Context,%20android.view.animation.Interpolator,%20float,%20float)" title="Reference documentation">Java documentation for <code>android.widget.OverScroller.OverScroller(android.content.Context, android.view.animation.Interpolator, float, float)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 9" />
       </Docs>
@@ -182,14 +205,27 @@
         <Parameter Name="flywheel" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="interpolator">To be added.</param>
-        <param name="bounceCoefficientX">To be added.</param>
-        <param name="bounceCoefficientY">To be added.</param>
-        <param name="flywheel">To be added.</param>
+        <param name="context">The context of this application.</param>
+        <param name="interpolator">The scroll interpolator. If null, a default (viscous) interpolator will
+            be used.</param>
+        <param name="bounceCoefficientX">A value between 0 and 1 that will determine the proportion of the
+            velocity which is preserved in the bounce when the horizontal edge is reached. A null value
+            means no bounce. This behavior is no longer supported and this coefficient has no effect.</param>
+        <param name="bounceCoefficientY">Same as bounceCoefficientX but for the vertical direction. This
+            behavior is no longer supported and this coefficient has no effect.</param>
+        <param name="flywheel">If true, successive fling motions will keep on increasing scroll speed.</param>
         <summary>Creates an OverScroller.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/OverScroller#OverScroller(android.content.Context,%20android.view.animation.Interpolator,%20float,%20float,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.OverScroller.OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 11" />
       </Docs>
@@ -503,10 +539,6 @@
         <param name="maxY">Maximum Y value. The scroller will not scroll past this point
                        unless overY &gt; 0. If overfling is allowed, it will use maxY as
                        a springback boundary.</param>
-        <param name="overX">Overfling range. If &gt; 0, horizontal overfling in either
-                       direction will be possible.</param>
-        <param name="overY">Overfling range. If &gt; 0, vertical overfling in either
-                       direction will be possible.</param>
         <summary>Start scrolling based on a fling gesture.</summary>
         <remarks>
           <para>
@@ -999,8 +1031,6 @@
         <Parameter Name="duration" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="duration">Duration of the scroll in milliseconds.
-</param>
         <param name="startX">Starting horizontal scroll offset in pixels. Positive
                    numbers will scroll the content to the left.</param>
         <param name="startY">Starting vertical scroll offset in pixels. Positive numbers
@@ -1009,11 +1039,12 @@
                    content to the left.</param>
         <param name="dy">Vertical distance to travel. Positive numbers will scroll the
                    content up.</param>
+        <param name="duration">Duration of the scroll in milliseconds.</param>
         <summary>Start scrolling by providing a starting point and the distance to travel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/OverScroller#startScroll(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.OverScroller.startScroll(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/OverScroller#startScroll(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.OverScroller.startScroll(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/PopupMenu.xml b/docs/Mono.Android/en/Android.Widget/PopupMenu.xml
index d0fa0e5020..1e53b0738b 100644
--- a/docs/Mono.Android/en/Android.Widget/PopupMenu.xml
+++ b/docs/Mono.Android/en/Android.Widget/PopupMenu.xml
@@ -128,16 +128,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="gravity">To be added.</param>
         <param name="context">Context the popup menu is running in, through which it
                    can access the current theme, resources, etc.</param>
         <param name="anchor">Anchor view for this popup. The popup will appear below
                    the anchor if there is room, or above it if there is not.</param>
-        <summary>Constructor to create a new popup menu with an anchor view.</summary>
+        <param name="gravity">The <c>Gravity</c> value for aligning the popup with its
+                   anchor.</param>
+        <summary>Constructor to create a new popup menu with an anchor view and alignment
+            gravity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupMenu#PopupMenu(android.content.Context,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.PopupMenu.PopupMenu(android.content.Context, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupMenu#PopupMenu(android.content.Context,%20android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupMenu.PopupMenu(android.content.Context, android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -179,18 +181,24 @@
         <Parameter Name="popupStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="gravity">To be added.</param>
-        <param name="popupStyleAttr">To be added.</param>
-        <param name="popupStyleRes">To be added.</param>
         <param name="context">Context the popup menu is running in, through which it
                    can access the current theme, resources, etc.</param>
         <param name="anchor">Anchor view for this popup. The popup will appear below
                    the anchor if there is room, or above it if there is not.</param>
-        <summary>Constructor to create a new popup menu with an anchor view.</summary>
+        <param name="gravity">The <c>Gravity</c> value for aligning the popup with its
+                   anchor.</param>
+        <param name="popupStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the popup window. Can be 0 to not look for defaults.</param>
+        <param name="popupStyleRes">A resource identifier of a style resource that
+                   supplies default values for the popup window, used only if
+                   popupStyleAttr is 0 or can not be found in the theme. Can be 0
+                   to not look for defaults.</param>
+        <summary>Constructor a create a new popup menu with a specific style.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupMenu#PopupMenu(android.content.Context,%20android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.PopupMenu.PopupMenu(android.content.Context, android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupMenu#PopupMenu(android.content.Context,%20android.view.View,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupMenu.PopupMenu(android.content.Context, android.view.View, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/PopupWindow.xml b/docs/Mono.Android/en/Android.Widget/PopupWindow.xml
index 44bd50cfd0..b401c3a961 100644
--- a/docs/Mono.Android/en/Android.Widget/PopupWindow.xml
+++ b/docs/Mono.Android/en/Android.Widget/PopupWindow.xml
@@ -93,7 +93,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(android.content.Context)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +125,13 @@
         <Parameter Name="contentView" Type="Android.Views.View" />
       </Parameters>
       <Docs>
-        <param name="contentView">To be added.</param>
-        <summary>Create a new empty, non focusable popup window of dimension (0,0).</summary>
+        <param name="contentView">the popup's content</param>
+        <summary>Create a new non focusable popup window which can display the
+            <c>contentView</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(android.view.View)</code>.</a>
             </format>
           </para>
           <para>
@@ -169,7 +170,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,13 +203,13 @@
         <Parameter Name="height" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="width">To be added.</param>
-        <param name="height">To be added.</param>
-        <summary>Create a new empty, non focusable popup window of dimension (0,0).</summary>
+        <param name="width">the popup's width</param>
+        <param name="height">the popup's height</param>
+        <summary>Create a new empty, non focusable popup window.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -272,7 +273,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +307,15 @@
         <Parameter Name="height" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="contentView">To be added.</param>
-        <param name="width">To be added.</param>
-        <param name="height">To be added.</param>
-        <summary>Create a new empty, non focusable popup window of dimension (0,0).</summary>
+        <param name="contentView">the popup's content</param>
+        <param name="width">the popup's width</param>
+        <param name="height">the popup's height</param>
+        <summary>Create a new non focusable popup window which can display the
+            <c>contentView</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(android.view.View,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(android.view.View, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -352,11 +354,11 @@
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="defStyleRes">To be added.</param>
-        <summary>Create a new empty, non focusable popup window of dimension (0,0).</summary>
+        <summary>Create a new, empty, non focusable popup window of dimension (0,0).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -391,15 +393,15 @@
         <Parameter Name="focusable" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="contentView">To be added.</param>
-        <param name="width">To be added.</param>
-        <param name="height">To be added.</param>
-        <param name="focusable">To be added.</param>
-        <summary>Create a new empty, non focusable popup window of dimension (0,0).</summary>
+        <param name="contentView">the popup's content</param>
+        <param name="width">the popup's width</param>
+        <param name="height">the popup's height</param>
+        <param name="focusable">true if the popup can be focused, false otherwise</param>
+        <summary>Create a new popup window which can display the <c>contentView</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow()" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#PopupWindow(android.view.View,%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.PopupWindow(android.view.View, int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1007,8 +1009,8 @@
         <Parameter Name="yOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="yOffset">y offset from the view's bottom edge</param>
         <param name="anchor">The view on which the popup window must be anchored.</param>
+        <param name="yOffset">y offset from the view's bottom edge</param>
         <summary>Returns the maximum height that is available for the popup to be
             completely shown.</summary>
         <returns>The maximum available height for the popup to be completely
@@ -1016,7 +1018,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#getMaxAvailableHeight(android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.getMaxAvailableHeight(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#getMaxAvailableHeight(android.view.View,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.getMaxAvailableHeight(android.view.View, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1053,17 +1055,20 @@
         <Parameter Name="ignoreBottomDecorations" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="yOffset">To be added.</param>
-        <param name="ignoreBottomDecorations">To be added.</param>
         <param name="anchor">The view on which the popup window must be anchored.</param>
+        <param name="yOffset">y offset from the view's bottom edge</param>
+        <param name="ignoreBottomDecorations">if true, the height returned will be
+                   all the way to the bottom of the display, ignoring any
+                   bottom decorations</param>
         <summary>Returns the maximum height that is available for the popup to be
-            completely shown.</summary>
+            completely shown, optionally ignoring any bottom decorations such as
+            the input method.</summary>
         <returns>The maximum available height for the popup to be completely
                     shown.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#getMaxAvailableHeight(android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.getMaxAvailableHeight(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#getMaxAvailableHeight(android.view.View,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.getMaxAvailableHeight(android.view.View, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1851,15 +1856,15 @@
         <Parameter Name="yoff" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="anchor">the view on which to pin the popup window</param>
         <param name="xoff">A horizontal offset from the anchor in pixels</param>
         <param name="yoff">A vertical offset from the anchor in pixels</param>
-        <param name="anchor">the view on which to pin the popup window</param>
         <summary>Display the content view in a popup window anchored to the bottom-left
-            corner of the anchor view.</summary>
+            corner of the anchor view offset by the specified x and y coordinates.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#showAsDropDown(android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.showAsDropDown(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#showAsDropDown(android.view.View,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.showAsDropDown(android.view.View, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1905,16 +1910,16 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="anchor">the view on which to pin the popup window</param>
         <param name="xoff">A horizontal offset from the anchor in pixels</param>
         <param name="yoff">A vertical offset from the anchor in pixels</param>
         <param name="gravity">Alignment of the popup relative to the anchor</param>
-        <param name="anchor">the view on which to pin the popup window</param>
-        <summary>Display the content view in a popup window anchored to the bottom-left
-            corner of the anchor view.</summary>
+        <summary>Displays the content view in a popup window anchored to the corner of
+            another view.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#showAsDropDown(android.view.View)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.showAsDropDown(android.view.View)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#showAsDropDown(android.view.View,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.showAsDropDown(android.view.View, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1959,8 +1964,7 @@
         <Parameter Name="y" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parent">a parent view to get the <see cref="P:Android.Views.View.WindowToken" /> token from</param>
-        <param name="token">Window token to use for creating the new window</param>
+        <param name="parent">a parent view to get the <c>android.view.View#getWindowToken()</c> token from</param>
         <param name="gravity">the gravity which controls the placement of the popup window</param>
         <param name="x">the popup's x location offset</param>
         <param name="y">the popup's y location offset</param>
@@ -1968,7 +1972,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/PopupWindow#showAtLocation(android.os.IBinder,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.showAtLocation(android.os.IBinder, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#showAtLocation(android.view.View,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.showAtLocation(android.view.View, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2326,12 +2330,20 @@
         <Parameter Name="height" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="width">the new width, must be &gt;= 0 or -1 to ignore</param>
-        <param name="height">the new height, must be &gt;= 0 or -1 to ignore
-</param>
+        <param name="width">the new width in pixels, must be &gt;= 0 or -1 to ignore</param>
+        <param name="height">the new height in pixels, must be &gt;= 0 or -1 to ignore</param>
         <summary>Updates the dimension of the popup window.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#update(int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.update(int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 4" />
       </Docs>
@@ -2362,12 +2374,20 @@
       </Parameters>
       <Docs>
         <param name="anchor">the popup's anchor view</param>
-        <param name="width">the new width, must be &gt;= 0 or -1 to ignore</param>
-        <param name="height">the new height, must be &gt;= 0 or -1 to ignore
-</param>
+        <param name="width">the new width in pixels, must be &gt;= 0 or -1 to ignore</param>
+        <param name="height">the new height in pixels, must be &gt;= 0 or -1 to ignore</param>
         <summary>Updates the position and the dimension of the popup window.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#update(android.view.View,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.update(android.view.View, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -2400,12 +2420,20 @@
       <Docs>
         <param name="x">the new x location</param>
         <param name="y">the new y location</param>
-        <param name="width">the new width, must be &gt;= 0 or -1 to ignore</param>
-        <param name="height">the new height, must be &gt;= 0 or -1 to ignore
-</param>
+        <param name="width">the new width in pixels, must be &gt;= 0 or -1 to ignore</param>
+        <param name="height">the new height in pixels, must be &gt;= 0 or -1 to ignore</param>
         <summary>Updates the position and the dimension of the popup window.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#update(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.update(int, int, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -2440,12 +2468,20 @@
         <param name="anchor">the popup's anchor view</param>
         <param name="xoff">x offset from the view's left edge</param>
         <param name="yoff">y offset from the view's bottom edge</param>
-        <param name="width">the new width, must be &gt;= 0 or -1 to ignore</param>
-        <param name="height">the new height, must be &gt;= 0 or -1 to ignore
-</param>
+        <param name="width">the new width in pixels, must be &gt;= 0 or -1 to ignore</param>
+        <param name="height">the new height in pixels, must be &gt;= 0 or -1 to ignore</param>
         <summary>Updates the position and the dimension of the popup window.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#update(android.view.View,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.update(android.view.View, int, int, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -2479,16 +2515,24 @@
       <Docs>
         <param name="x">the new x location</param>
         <param name="y">the new y location</param>
-        <param name="width">the new width, must be &gt;= 0 or -1 to ignore</param>
-        <param name="height">the new height, must be &gt;= 0 or -1 to ignore</param>
+        <param name="width">the new width in pixels, must be &gt;= 0 or -1 to ignore</param>
+        <param name="height">the new height in pixels, must be &gt;= 0 or -1 to ignore</param>
         <param name="force">
           <c>true</c> to reposition the window even if the specified
-              position already seems to correspond to the LayoutParams,
-              <c>false</c> to only reposition if needed
-</param>
+                         position already seems to correspond to the LayoutParams,
+                         <c>false</c> to only reposition if needed</param>
         <summary>Updates the position and the dimension of the popup window.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/PopupWindow#update(int,%20int,%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.PopupWindow.update(int, int, int, int, boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 3" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Widget/ProgressBar.xml b/docs/Mono.Android/en/Android.Widget/ProgressBar.xml
index 42f87a5b12..73306b82bb 100644
--- a/docs/Mono.Android/en/Android.Widget/ProgressBar.xml
+++ b/docs/Mono.Android/en/Android.Widget/ProgressBar.xml
@@ -92,8 +92,8 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">the application environment</param>
+        <param name="attrs">To be added.</param>
         <summary>Create a new progress bar with range 0.</summary>
         <remarks>
           <para>
@@ -155,9 +155,9 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">the application environment</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
-        <param name="context">the application environment</param>
         <summary>Create a new progress bar with range 0.</summary>
         <remarks>
           <para>
@@ -197,10 +197,10 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">the application environment</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="defStyleRes">To be added.</param>
-        <param name="context">the application environment</param>
         <summary>Create a new progress bar with range 0.</summary>
         <remarks>
           <para>
@@ -566,8 +566,6 @@
         <ReturnType>Android.Graphics.PorterDuff+Mode</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="tintMode">the blending mode used to apply the tint, may be
-                            <c>null</c> to clear tint</param>
         <summary>Returns the blending mode used to apply the tint to the indeterminate
             drawable, if specified. -or- Specifies the blending mode used to apply the tint specified by
             <c>#setIndeterminateTintList(ColorStateList)</c> to the indeterminate
@@ -622,8 +620,7 @@
         <ReturnType>Android.Views.Animations.IInterpolator</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="context">The application environment</param>
-        <param name="resID">The resource identifier of the interpolator to load</param>
+        <param name="interpolator">The interpolator which defines the acceleration curve</param>
         <summary>Gets the acceleration curve type for the indeterminate animation. -or- Sets the acceleration curve for the indeterminate animation.</summary>
         <value>the <c>Interpolator</c> associated to this animation</value>
         <remarks>
@@ -636,7 +633,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ProgressBar#setInterpolator(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ProgressBar.setInterpolator(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ProgressBar#setInterpolator(android.view.animation.Interpolator)" title="Reference documentation">Java documentation for <code>android.widget.ProgressBar.setInterpolator(android.view.animation.Interpolator)</code>.</a>
             </format>
           </para>
           <para>
@@ -1759,11 +1756,23 @@
         <Parameter Name="animate" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="progress">To be added.</param>
-        <param name="animate">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="progress">the new progress value, between <c>#getMin()</c> and <c>#getMax()</c></param>
+        <param name="animate">
+          <c>true</c> to animate between the current and target
+                           values or <c>false</c> to not animate</param>
+        <summary>Sets the current progress to the specified value, optionally animating
+            the visual position between the current and target values.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/ProgressBar#setProgress(int,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.ProgressBar.setProgress(int, boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/Mono.Android/en/Android.Widget/QuickContactBadge.xml b/docs/Mono.Android/en/Android.Widget/QuickContactBadge.xml
index 3306708974..259915cb5b 100644
--- a/docs/Mono.Android/en/Android.Widget/QuickContactBadge.xml
+++ b/docs/Mono.Android/en/Android.Widget/QuickContactBadge.xml
@@ -266,18 +266,18 @@
         <Parameter Name="extras" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="extras">A bundle of extras to populate the contact edit page with if the contact
-     is not found and the user chooses to add the email address to an existing contact or
-     create a new contact. Uses the same string constants as those found in
-     <see cref="T:Android.Provider.ContactsContract.Intents.Insert" /></param>
         <param name="emailAddress">The email address of the contact.</param>
         <param name="lazyLookup">If this is true, the lookup query will not be performed
-            until this view is clicked.</param>
+                 until this view is clicked.</param>
+        <param name="extras">A bundle of extras to populate the contact edit page with if the contact
+                 is not found and the user chooses to add the email address to an existing contact or
+                 create a new contact. Uses the same string constants as those found in
+                 <c>android.provider.ContactsContract.Intents.Insert</c></param>
         <summary>Assign a contact based on an email address.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/QuickContactBadge#assignContactFromEmail(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.QuickContactBadge.assignContactFromEmail(java.lang.String, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/QuickContactBadge#assignContactFromEmail(java.lang.String,%20boolean,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.widget.QuickContactBadge.assignContactFromEmail(java.lang.String, boolean, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
@@ -357,18 +357,18 @@
         <Parameter Name="extras" Type="Android.OS.Bundle" />
       </Parameters>
       <Docs>
-        <param name="extras">A bundle of extras to populate the contact edit page with if the contact
- is not found and the user chooses to add the phone number to an existing contact or
- create a new contact. Uses the same string constants as those found in
- <see cref="T:Android.Provider.ContactsContract.Intents.Insert" /></param>
         <param name="phoneNumber">The phone number of the contact.</param>
         <param name="lazyLookup">If this is true, the lookup query will not be performed
             until this view is clicked.</param>
+        <param name="extras">A bundle of extras to populate the contact edit page with if the contact
+            is not found and the user chooses to add the phone number to an existing contact or
+            create a new contact. Uses the same string constants as those found in
+            <c>android.provider.ContactsContract.Intents.Insert</c></param>
         <summary>Assign a contact based on a phone number.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/QuickContactBadge#assignContactFromPhone(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.QuickContactBadge.assignContactFromPhone(java.lang.String, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/QuickContactBadge#assignContactFromPhone(java.lang.String,%20boolean,%20android.os.Bundle)" title="Reference documentation">Java documentation for <code>android.widget.QuickContactBadge.assignContactFromPhone(java.lang.String, boolean, android.os.Bundle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/RadioGroup.xml b/docs/Mono.Android/en/Android.Widget/RadioGroup.xml
index 58175f7c47..aaf3542bf6 100644
--- a/docs/Mono.Android/en/Android.Widget/RadioGroup.xml
+++ b/docs/Mono.Android/en/Android.Widget/RadioGroup.xml
@@ -99,7 +99,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RadioGroup#RadioGroup(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.RadioGroup.RadioGroup(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RadioGroup#RadioGroup(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.RadioGroup.RadioGroup(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/RatingBar.xml b/docs/Mono.Android/en/Android.Widget/RatingBar.xml
index 5a4d74d47e..d89623de76 100644
--- a/docs/Mono.Android/en/Android.Widget/RatingBar.xml
+++ b/docs/Mono.Android/en/Android.Widget/RatingBar.xml
@@ -339,7 +339,6 @@
         <ReturnType>Android.Widget.RatingBar+IOnRatingBarChangeListener</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="listener">The listener.</param>
         <summary>Sets the listener to be called when the rating changes.</summary>
         <value>The listener (may be null) that is listening for rating change
                     events.</value>
diff --git a/docs/Mono.Android/en/Android.Widget/RemoteViews.xml b/docs/Mono.Android/en/Android.Widget/RemoteViews.xml
index cadf4fa0a3..c0b3e51db3 100644
--- a/docs/Mono.Android/en/Android.Widget/RemoteViews.xml
+++ b/docs/Mono.Android/en/Android.Widget/RemoteViews.xml
@@ -100,8 +100,19 @@
       </Parameters>
       <Docs>
         <param name="src">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <summary>Creates a copy of another RemoteViews.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#RemoteViews(android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.RemoteViews(android.widget.RemoteViews)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -124,9 +135,21 @@
         <Parameter Name="remoteViews" Type="System.Collections.Generic.IDictionary&lt;Android.Util.SizeF,Android.Widget.RemoteViews&gt;" />
       </Parameters>
       <Docs>
-        <param name="remoteViews">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="remoteViews">Mapping of size to layout.</param>
+        <summary>Create a new RemoteViews object that will inflate the layout with the closest size
+            specification.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#RemoteViews(java.util.Map)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.RemoteViews(java.util.Map)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -150,12 +173,21 @@
         <Parameter Name="portrait" Type="Android.Widget.RemoteViews" />
       </Parameters>
       <Docs>
-        <param name="landscape">To be added.</param>
-        <param name="portrait">To be added.</param>
+        <param name="landscape">The RemoteViews to inflate in landscape configuration</param>
+        <param name="portrait">The RemoteViews to inflate in portrait configuration</param>
         <summary>Create a new RemoteViews object that will inflate as the specified
- landspace or portrait RemoteViews, depending on the current configuration.</summary>
+            landspace or portrait RemoteViews, depending on the current configuration.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#RemoteViews(android.widget.RemoteViews,%20android.widget.RemoteViews)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.RemoteViews(android.widget.RemoteViews, android.widget.RemoteViews)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 16" />
       </Docs>
@@ -204,12 +236,21 @@
         <Parameter Name="layoutId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="layoutId">To be added.</param>
+        <param name="packageName">Name of the package that contains the layout resource</param>
+        <param name="layoutId">The id of the layout resource</param>
         <summary>Create a new RemoteViews object that will display the views contained
- in the specified layout file.</summary>
+            in the specified layout file.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#RemoteViews(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.RemoteViews(java.lang.String, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
@@ -236,11 +277,23 @@
         <Parameter Name="viewId" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="packageName">To be added.</param>
-        <param name="layoutId">To be added.</param>
         <param name="viewId">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
+        <param name="packageName">Name of the package that contains the layout resource</param>
+        <param name="layoutId">The id of the layout resource</param>
+        <summary>Create a new RemoteViews object that will display the views contained
+            in the specified layout file and change the id of the root view to the specified one.</summary>
+        <remarks>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#RemoteViews(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.RemoteViews(java.lang.String, int, int)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="AddStableView">
@@ -1425,16 +1478,14 @@
         <Parameter Name="value" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="value">The value to pass to the method.
-</param>
         <param name="viewId">The id of the view on which to call the method.</param>
         <param name="methodName">The name of the method to call.</param>
-        <param name="stringResource">The resource to resolve and pass as argument to the method.</param>
+        <param name="value">The value to pass to the method.</param>
         <summary>Call a method taking one CharSequence on a view in the layout for this RemoteViews.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setCharSequence(int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setCharSequence(int, java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setCharSequence(int,%20java.lang.String,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setCharSequence(int, java.lang.String, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1508,15 +1559,14 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
         <param name="viewId">The id of the view on which to call the method.</param>
         <param name="methodName">The name of the method to call.</param>
-        <param name="stringResource">The resource to resolve and pass as argument to the method.</param>
+        <param name="value">The value to pass to the method.</param>
         <summary>Call a method taking one CharSequence on a view in the layout for this RemoteViews.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setCharSequence(int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setCharSequence(int, java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setCharSequence(int,%20java.lang.String,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setCharSequence(int, java.lang.String, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1823,15 +1873,14 @@
         <Parameter Name="value" Type="Android.Content.Res.ColorStateList" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
         <param name="viewId">The id of the view on which to call the method.</param>
         <param name="methodName">The name of the method to call.</param>
-        <param name="colorResource">The resource to resolve and pass as argument to the method.</param>
+        <param name="value">The value to pass to the method.</param>
         <summary>Call a method taking one ColorStateList on a view in the layout for this RemoteViews.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setColorStateList(int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setColorStateList(int, java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setColorStateList(int,%20java.lang.String,%20android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setColorStateList(int, java.lang.String, android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
@@ -1911,16 +1960,17 @@
         <Parameter Name="night" Type="Android.Content.Res.ColorStateList" />
       </Parameters>
       <Docs>
-        <param name="notNight">To be added.</param>
-        <param name="night">To be added.</param>
         <param name="viewId">The id of the view on which to call the method.</param>
         <param name="methodName">The name of the method to call.</param>
-        <param name="colorResource">The resource to resolve and pass as argument to the method.</param>
+        <param name="notNight">The value to pass to the method when the view's configuration is set to
+                            <c>Configuration#UI_MODE_NIGHT_NO</c></param>
+        <param name="night">The value to pass to the method when the view's configuration is set to
+                            <c>Configuration#UI_MODE_NIGHT_YES</c></param>
         <summary>Call a method taking one ColorStateList on a view in the layout for this RemoteViews.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setColorStateList(int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setColorStateList(int, java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setColorStateList(int,%20java.lang.String,%20android.content.res.ColorStateList,%20android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setColorStateList(int, java.lang.String, android.content.res.ColorStateList, android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
@@ -2290,17 +2340,15 @@
         <Parameter Name="dimenResource" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dimenResource">To be added.</param>
         <param name="viewId">The id of the view on which to call the method.</param>
         <param name="methodName">The name of the method to call.</param>
-        <param name="value">The value of the dimension.</param>
-        <param name="unit">The unit in which the value is specified.</param>
+        <param name="dimenResource">The resource to resolve and pass as argument to the method.</param>
         <summary>Call a method taking one float, a size in pixels, on a view in the layout for this
             RemoteViews.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setFloatDimen(int,%20java.lang.String,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setFloatDimen(int, java.lang.String, float, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setFloatDimen(int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setFloatDimen(int, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2477,16 +2525,17 @@
         <Parameter Name="night" Type="Android.Graphics.Drawables.Icon" />
       </Parameters>
       <Docs>
-        <param name="notNight">To be added.</param>
-        <param name="night">To be added.</param>
         <param name="viewId">The id of the view on which to call the method.</param>
         <param name="methodName">The name of the method to call.</param>
-        <param name="value">The <c>android.graphics.drawable.Icon</c> to pass the method.</param>
+        <param name="notNight">The value to pass to the method when the view's configuration is set to
+                            <c>Configuration#UI_MODE_NIGHT_NO</c></param>
+        <param name="night">The value to pass to the method when the view's configuration is set to
+                            <c>Configuration#UI_MODE_NIGHT_YES</c></param>
         <summary>Call a method taking one Icon on a view in the layout for this RemoteViews.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setIcon(int,%20java.lang.String,%20android.graphics.drawable.Icon)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setIcon(int, java.lang.String, android.graphics.drawable.Icon)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setIcon(int,%20java.lang.String,%20android.graphics.drawable.Icon,%20android.graphics.drawable.Icon)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setIcon(int, java.lang.String, android.graphics.drawable.Icon, android.graphics.drawable.Icon)</code>.</a>
             </format>
           </para>
           <para>
@@ -2733,17 +2782,15 @@
         <Parameter Name="dimenResource" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dimenResource">To be added.</param>
         <param name="viewId">The id of the view on which to call the method.</param>
         <param name="methodName">The name of the method to call.</param>
-        <param name="value">The value of the dimension.</param>
-        <param name="unit">The unit in which the value is specified.</param>
+        <param name="dimenResource">The resource to resolve and pass as argument to the method.</param>
         <summary>Call a method taking one int, a size in pixels, on a view in the layout for this
             RemoteViews.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setIntDimen(int,%20java.lang.String,%20float,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setIntDimen(int, java.lang.String, float, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setIntDimen(int,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setIntDimen(int, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3397,8 +3444,6 @@
         <Parameter Name="intent" Type="Android.Content.Intent" />
       </Parameters>
       <Docs>
-        <param name="appWidgetId">The id of the app widget which contains the specified view. (This
-                 parameter is ignored in this deprecated method)</param>
         <param name="viewId">The id of the <c>AdapterView</c></param>
         <param name="intent">The intent of the service which will be
                        providing data to the RemoteViewsAdapter</param>
@@ -3406,7 +3451,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setRemoteAdapter(int,%20int,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setRemoteAdapter(int, int, android.content.Intent)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/RemoteViews#setRemoteAdapter(int,%20android.content.Intent)" title="Reference documentation">Java documentation for <code>android.widget.RemoteViews.setRemoteAdapter(int, android.content.Intent)</code>.</a>
             </format>
           </para>
           <para>
@@ -3442,12 +3487,8 @@
         <Parameter Name="items" Type="Android.Widget.RemoteViews+RemoteCollectionItems" />
       </Parameters>
       <Docs>
-        <param name="items">To be added.</param>
-        <param name="appWidgetId">The id of the app widget which contains the specified view. (This
-                 parameter is ignored in this deprecated method)</param>
         <param name="viewId">The id of the <c>AdapterView</c></param>
-        <param name="intent">The intent of the service which will be
-                       providing data to the RemoteViewsAdapter</param>
+        <param name="items">To be added.</param>
         <summary>Equivalent to calling <c>android.widget.AbsListView#setRemoteViewsAdapter(Intent)</c>.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ResourceCursorAdapter.xml b/docs/Mono.Android/en/Android.Widget/ResourceCursorAdapter.xml
index ee27d28eca..282c88aeff 100644
--- a/docs/Mono.Android/en/Android.Widget/ResourceCursorAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/ResourceCursorAdapter.xml
@@ -134,17 +134,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <param name="flags">To be added.</param>
         <param name="context">The context where the ListView associated with this adapter is running</param>
-        <param name="layout">resource identifier of a layout file that defines the views
+        <param name="layout">Resource identifier of a layout file that defines the views
                        for this list item.  Unless you override them later, this will
                        define both the item views and the drop down views.</param>
-        <summary>Constructor the enables auto-requery.</summary>
+        <param name="c">The cursor from which to get the data.</param>
+        <param name="flags">Flags used to determine the behavior of the adapter,
+            as per <c>CursorAdapter#CursorAdapter(Context, Cursor, int)</c>.</param>
+        <summary>Standard constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter#ResourceCursorAdapter(android.content.Context,%20int,%20android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorAdapter.ResourceCursorAdapter(android.content.Context, int, android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter#ResourceCursorAdapter(android.content.Context,%20int,%20android.database.Cursor,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorAdapter.ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -179,17 +180,21 @@
         <Parameter Name="autoRequery" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <param name="autoRequery">To be added.</param>
         <param name="context">The context where the ListView associated with this adapter is running</param>
         <param name="layout">resource identifier of a layout file that defines the views
                        for this list item.  Unless you override them later, this will
                        define both the item views and the drop down views.</param>
-        <summary>Constructor the enables auto-requery.</summary>
+        <param name="c">The cursor from which to get the data.</param>
+        <param name="autoRequery">If true the adapter will call requery() on the
+                               cursor whenever it changes so the most recent
+                               data is always displayed.  Using true here is discouraged.</param>
+        <summary>Constructor with default behavior as per
+            <c>CursorAdapter#CursorAdapter(Context, Cursor, boolean)</c>; it is recommended
+            you not use this, but instead <c>#ResourceCursorAdapter(Context, int, Cursor, int)</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter#ResourceCursorAdapter(android.content.Context,%20int,%20android.database.Cursor)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorAdapter.ResourceCursorAdapter(android.content.Context, int, android.database.Cursor)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter#ResourceCursorAdapter(android.content.Context,%20int,%20android.database.Cursor,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorAdapter.ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ResourceCursorTreeAdapter.xml b/docs/Mono.Android/en/Android.Widget/ResourceCursorTreeAdapter.xml
index 3f2c2112ad..c43dd4292e 100644
--- a/docs/Mono.Android/en/Android.Widget/ResourceCursorTreeAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/ResourceCursorTreeAdapter.xml
@@ -128,20 +128,20 @@
         <Parameter Name="childLayout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="collapsedGroupLayout">To be added.</param>
-        <param name="expandedGroupLayout">To be added.</param>
         <param name="context">The context where the ListView associated with this
                        SimpleListItemFactory is running</param>
         <param name="cursor">The database cursor</param>
-        <param name="groupLayout">resource identifier of a layout file that defines the
-                       views for all groups.</param>
+        <param name="collapsedGroupLayout">resource identifier of a layout file that
+                       defines the views for collapsed groups.</param>
+        <param name="expandedGroupLayout">resource identifier of a layout file that
+                       defines the views for expanded groups.</param>
         <param name="childLayout">resource identifier of a layout file that defines the
                        views for all children.</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter#ResourceCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorTreeAdapter.ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter#ResourceCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorTreeAdapter.ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -178,21 +178,22 @@
         <Parameter Name="lastChildLayout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="collapsedGroupLayout">To be added.</param>
-        <param name="expandedGroupLayout">To be added.</param>
-        <param name="lastChildLayout">To be added.</param>
         <param name="context">The context where the ListView associated with this
                        SimpleListItemFactory is running</param>
         <param name="cursor">The database cursor</param>
-        <param name="groupLayout">resource identifier of a layout file that defines the
-                       views for all groups.</param>
+        <param name="collapsedGroupLayout">resource identifier of a layout file that
+                       defines the views for collapsed groups.</param>
+        <param name="expandedGroupLayout">resource identifier of a layout file that
+                       defines the views for expanded groups.</param>
         <param name="childLayout">resource identifier of a layout file that defines the
-                       views for all children.</param>
+                       views for all children but the last..</param>
+        <param name="lastChildLayout">resource identifier of a layout file that defines
+                       the views for the last child of a group.</param>
         <summary>Constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter#ResourceCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorTreeAdapter.ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter#ResourceCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ResourceCursorTreeAdapter.ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Scroller.xml b/docs/Mono.Android/en/Android.Widget/Scroller.xml
index ff54c384db..2eab5de5c1 100644
--- a/docs/Mono.Android/en/Android.Widget/Scroller.xml
+++ b/docs/Mono.Android/en/Android.Widget/Scroller.xml
@@ -94,11 +94,11 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="interpolator">To be added.</param>
-        <summary>Create a Scroller with the default duration and interpolator.</summary>
+        <summary>Create a Scroller with the specified interpolator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Scroller#Scroller(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Scroller.Scroller(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Scroller#Scroller(android.content.Context,%20android.view.animation.Interpolator)" title="Reference documentation">Java documentation for <code>android.widget.Scroller.Scroller(android.content.Context, android.view.animation.Interpolator)</code>.</a>
             </format>
           </para>
           <para>
@@ -158,11 +158,11 @@
         <param name="context">To be added.</param>
         <param name="interpolator">To be added.</param>
         <param name="flywheel">To be added.</param>
-        <summary>Create a Scroller with the default duration and interpolator.</summary>
+        <summary>Create a Scroller with the specified interpolator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Scroller#Scroller(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Scroller.Scroller(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Scroller#Scroller(android.content.Context,%20android.view.animation.Interpolator,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.Scroller.Scroller(android.content.Context, android.view.animation.Interpolator, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -829,8 +829,6 @@
         <Parameter Name="duration" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="duration">Duration of the scroll in milliseconds.
-</param>
         <param name="startX">Starting horizontal scroll offset in pixels. Positive
                    numbers will scroll the content to the left.</param>
         <param name="startY">Starting vertical scroll offset in pixels. Positive numbers
@@ -839,11 +837,13 @@
                    content to the left.</param>
         <param name="dy">Vertical distance to travel. Positive numbers will scroll the
                    content up.</param>
-        <summary>Start scrolling by providing a starting point and the distance to travel.</summary>
+        <param name="duration">Duration of the scroll in milliseconds.</param>
+        <summary>Start scrolling by providing a starting point, the distance to travel,
+            and the duration of the scroll.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Scroller#startScroll(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Scroller.startScroll(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Scroller#startScroll(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Scroller.startScroll(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/SearchView.xml b/docs/Mono.Android/en/Android.Widget/SearchView.xml
index 0e308d4088..1a9765d1a7 100644
--- a/docs/Mono.Android/en/Android.Widget/SearchView.xml
+++ b/docs/Mono.Android/en/Android.Widget/SearchView.xml
@@ -1215,15 +1215,14 @@
       </Parameters>
       <Docs>
         <param name="query">the query string. This replaces any query text already present in the
- text field.</param>
+            text field.</param>
         <param name="submit">whether to submit the query right now or only update the contents of
- text field.
-</param>
-        <summary>Sets the text in the query box, without updating the suggestions.</summary>
+            text field.</param>
+        <summary>Sets a query string in the text field and optionally submits the query as well.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SearchView#setQuery(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.SearchView.setQuery(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SearchView#setQuery(java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.SearchView.setQuery(java.lang.CharSequence, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1253,13 +1252,15 @@
         <Parameter Name="submit" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="query">To be added.</param>
-        <param name="submit">To be added.</param>
-        <summary>Sets the text in the query box, without updating the suggestions.</summary>
+        <param name="query">the query string. This replaces any query text already present in the
+            text field.</param>
+        <param name="submit">whether to submit the query right now or only update the contents of
+            text field.</param>
+        <summary>Sets a query string in the text field and optionally submits the query as well.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SearchView#setQuery(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.SearchView.setQuery(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SearchView#setQuery(java.lang.CharSequence,%20boolean)" title="Reference documentation">Java documentation for <code>android.widget.SearchView.setQuery(java.lang.CharSequence, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/SimpleAdapter.xml b/docs/Mono.Android/en/Android.Widget/SimpleAdapter.xml
index 616163b002..579e50afaf 100644
--- a/docs/Mono.Android/en/Android.Widget/SimpleAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/SimpleAdapter.xml
@@ -196,8 +196,6 @@
         <ReturnType>Android.Content.Res.Resources+Theme</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="theme">the theme against which to inflate drop-down views or
-                         <c>null</c> to use the theme from the adapter's context</param>
         <summary>Sets the <c>android.content.res.Resources.Theme</c> against which drop-down views are
             inflated.</summary>
         <value>To be added.</value>
@@ -541,7 +539,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SimpleAdapter#setViewImage(android.widget.ImageView,%20int)" title="Reference documentation">Java documentation for <code>android.widget.SimpleAdapter.setViewImage(android.widget.ImageView, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SimpleAdapter#setViewImage(android.widget.ImageView,%20java.lang.String)" title="Reference documentation">Java documentation for <code>android.widget.SimpleAdapter.setViewImage(android.widget.ImageView, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -684,8 +682,6 @@
         <ReturnType>Android.Widget.SimpleAdapter+IViewBinder</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="viewBinder">the binder used to bind data to views, can be null to
-                   remove the existing binder</param>
         <summary>Returns the <c>ViewBinder</c> used to bind data to views. -or- Sets the binder used to bind data to views.</summary>
         <value>a ViewBinder or null if the binder does not exist</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Widget/SimpleCursorAdapter.xml b/docs/Mono.Android/en/Android.Widget/SimpleCursorAdapter.xml
index 72a53ee48f..c1f5577696 100644
--- a/docs/Mono.Android/en/Android.Widget/SimpleCursorAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/SimpleCursorAdapter.xml
@@ -139,17 +139,25 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="layout">To be added.</param>
-        <param name="c">To be added.</param>
-        <param name="from">To be added.</param>
-        <param name="to">To be added.</param>
-        <param name="flags">To be added.</param>
-        <summary>Constructor the enables auto-requery.</summary>
+        <param name="context">The context where the ListView associated with this
+                       SimpleListItemFactory is running</param>
+        <param name="layout">resource identifier of a layout file that defines the views
+                       for this list item. The layout file should include at least
+                       those named views defined in "to"</param>
+        <param name="c">The database cursor.  Can be null if the cursor is not available yet.</param>
+        <param name="from">A list of column names representing the data to bind to the UI.  Can be null 
+                       if the cursor is not available yet.</param>
+        <param name="to">The views that should display column in the "from" parameter.
+                       These should all be TextViews. The first N views in this list
+                       are given the values of the first N columns in the from
+                       parameter.  Can be null if the cursor is not available yet.</param>
+        <param name="flags">Flags used to determine the behavior of the adapter,
+            as per <c>CursorAdapter#CursorAdapter(Context, Cursor, int)</c>.</param>
+        <summary>Standard constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter#SimpleCursorAdapter(android.content.Context,%20int,%20android.database.Cursor,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleCursorAdapter.SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter#SimpleCursorAdapter(android.content.Context,%20int,%20android.database.Cursor,%20java.lang.String[],%20int[],%20int)" title="Reference documentation">Java documentation for <code>android.widget.SimpleCursorAdapter.SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -287,8 +295,6 @@
         <ReturnType>Android.Widget.SimpleCursorAdapter+ICursorToStringConverter</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="cursorToStringConverter">the Cursor to String converter, or
-                   null to remove the converter</param>
         <summary>Returns the converter used to convert the filtering Cursor
             into a String. -or- Sets the converter  used to convert the filtering Cursor
             into a String.</summary>
@@ -589,8 +595,6 @@
         <ReturnType>Android.Widget.SimpleCursorAdapter+IViewBinder</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="viewBinder">the binder used to bind data to views, can be null to
-                   remove the existing binder</param>
         <summary>Returns the <c>ViewBinder</c> used to bind data to views. -or- Sets the binder used to bind data to views.</summary>
         <value>a ViewBinder or null if the binder does not exist</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Widget/SimpleCursorTreeAdapter.xml b/docs/Mono.Android/en/Android.Widget/SimpleCursorTreeAdapter.xml
index ea6f601f27..baec6f05c6 100644
--- a/docs/Mono.Android/en/Android.Widget/SimpleCursorTreeAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/SimpleCursorTreeAdapter.xml
@@ -85,17 +85,13 @@
         <Parameter Name="childTo" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="groupLayout">To be added.</param>
         <param name="context">The context where the <c>ExpandableListView</c>
                        associated with this <c>SimpleCursorTreeAdapter</c> is
                        running</param>
         <param name="cursor">The database cursor</param>
-        <param name="collapsedGroupLayout">The resource identifier of a layout file that
-                       defines the views for a collapsed group. The layout file
-                       should include at least those named views defined in groupTo.</param>
-        <param name="expandedGroupLayout">The resource identifier of a layout file that
-                       defines the views for an expanded group. The layout file
-                       should include at least those named views defined in groupTo.</param>
+        <param name="groupLayout">The resource identifier of a layout file that defines
+                       the views for a group. The layout file should include at least
+                       those named views defined in groupTo.</param>
         <param name="groupFrom">A list of column names that will be used to display the
                        data for a group.</param>
         <param name="groupTo">The group views (from the group layouts) that should
@@ -103,12 +99,8 @@
                        TextViews or ImageViews. The first N views in this list are
                        given the values of the first N columns in the from parameter.</param>
         <param name="childLayout">The resource identifier of a layout file that defines
-                       the views for a child (except the last). The layout file
-                       should include at least those named views defined in childTo.</param>
-        <param name="lastChildLayout">The resource identifier of a layout file that
-                       defines the views for the last child within a group. The
-                       layout file should include at least those named views defined
-                       in childTo.</param>
+                       the views for a child. The layout file should include at least
+                       those named views defined in childTo.</param>
         <param name="childFrom">A list of column names that will be used to display the
                        data for a child.</param>
         <param name="childTo">The child views (from the child layouts) that should
@@ -119,7 +111,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter#SimpleCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20int,%20java.lang.String[],%20int[],%20int,%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleCursorTreeAdapter.SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, java.lang.String[], int[], int, int, java.lang.String[], int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter#SimpleCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20java.lang.String[],%20int[],%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleCursorTreeAdapter.SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, java.lang.String[], int[], int, java.lang.String[], int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -176,12 +168,8 @@
                        TextViews or ImageViews. The first N views in this list are
                        given the values of the first N columns in the from parameter.</param>
         <param name="childLayout">The resource identifier of a layout file that defines
-                       the views for a child (except the last). The layout file
+                       the views for a child. The layout file
                        should include at least those named views defined in childTo.</param>
-        <param name="lastChildLayout">The resource identifier of a layout file that
-                       defines the views for the last child within a group. The
-                       layout file should include at least those named views defined
-                       in childTo.</param>
         <param name="childFrom">A list of column names that will be used to display the
                        data for a child.</param>
         <param name="childTo">The child views (from the child layouts) that should
@@ -192,7 +180,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter#SimpleCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20int,%20java.lang.String[],%20int[],%20int,%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleCursorTreeAdapter.SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, java.lang.String[], int[], int, int, java.lang.String[], int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter#SimpleCursorTreeAdapter(android.content.Context,%20android.database.Cursor,%20int,%20int,%20java.lang.String[],%20int[],%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleCursorTreeAdapter.SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, java.lang.String[], int[], int, java.lang.String[], int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -559,8 +547,6 @@
         <ReturnType>Android.Widget.SimpleCursorTreeAdapter+IViewBinder</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="viewBinder">the binder used to bind data to views, can be null to
-                   remove the existing binder</param>
         <summary>Returns the <c>ViewBinder</c> used to bind data to views. -or- Sets the binder used to bind data to views.</summary>
         <value>a ViewBinder or null if the binder does not exist</value>
         <remarks>
diff --git a/docs/Mono.Android/en/Android.Widget/SimpleExpandableListAdapter.xml b/docs/Mono.Android/en/Android.Widget/SimpleExpandableListAdapter.xml
index 498c8ae138..e7b1efd62f 100644
--- a/docs/Mono.Android/en/Android.Widget/SimpleExpandableListAdapter.xml
+++ b/docs/Mono.Android/en/Android.Widget/SimpleExpandableListAdapter.xml
@@ -86,7 +86,6 @@
         <Parameter Name="childTo" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="groupLayout">To be added.</param>
         <param name="context">The context where the <c>ExpandableListView</c>
                        associated with this <c>SimpleExpandableListAdapter</c> is
                        running</param>
@@ -100,12 +99,9 @@
                        "groupFrom" parameter. These should all be TextViews. The
                        first N views in this list are given the values of the first N
                        columns in the groupFrom parameter.</param>
-        <param name="expandedGroupLayout">resource identifier of a view layout that
-                       defines the views for an expanded group. The layout file
-                       should include at least those named views defined in "groupTo"</param>
-        <param name="collapsedGroupLayout">resource identifier of a view layout that
-                       defines the views for a collapsed group. The layout file
-                       should include at least those named views defined in "groupTo"</param>
+        <param name="groupLayout">resource identifier of a view layout that defines the
+                       views for a group. The layout file should include at least
+                       those named views defined in "groupTo"</param>
         <param name="childData">A List of List of Maps. Each entry in the outer List
                        corresponds to a group (index by group position), each entry
                        in the inner List corresponds to a child within the group
@@ -120,18 +116,13 @@
                        first N views in this list are given the values of the first N
                        columns in the childFrom parameter.</param>
         <param name="childLayout">resource identifier of a view layout that defines the
-                       views for a child (unless it is the last child within a group,
-                       in which case the lastChildLayout is used). The layout file
-                       should include at least those named views defined in "childTo"</param>
-        <param name="lastChildLayout">resource identifier of a view layout that defines
-                       the views for the last child within each group. The layout
-                       file should include at least those named views defined in
-                       "childTo"</param>
+                       views for a child. The layout file should include at least
+                       those named views defined in "childTo"</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter#SimpleExpandableListAdapter(android.content.Context,%20java.util.List,%20int,%20int,%20java.lang.String[],%20int[],%20java.util.List,%20int,%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleExpandableListAdapter.SimpleExpandableListAdapter(android.content.Context, java.util.List, int, int, java.lang.String[], int[], java.util.List, int, int, java.lang.String[], int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter#SimpleExpandableListAdapter(android.content.Context,%20java.util.List,%20int,%20java.lang.String[],%20int[],%20java.util.List,%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleExpandableListAdapter.SimpleExpandableListAdapter(android.content.Context, java.util.List, int, java.lang.String[], int[], java.util.List, int, java.lang.String[], int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -204,18 +195,13 @@
                        first N views in this list are given the values of the first N
                        columns in the childFrom parameter.</param>
         <param name="childLayout">resource identifier of a view layout that defines the
-                       views for a child (unless it is the last child within a group,
-                       in which case the lastChildLayout is used). The layout file
-                       should include at least those named views defined in "childTo"</param>
-        <param name="lastChildLayout">resource identifier of a view layout that defines
-                       the views for the last child within each group. The layout
-                       file should include at least those named views defined in
-                       "childTo"</param>
+                       views for a child. The layout file should include at least
+                       those named views defined in "childTo"</param>
         <summary>Constructor</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter#SimpleExpandableListAdapter(android.content.Context,%20java.util.List,%20int,%20int,%20java.lang.String[],%20int[],%20java.util.List,%20int,%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleExpandableListAdapter.SimpleExpandableListAdapter(android.content.Context, java.util.List, int, int, java.lang.String[], int[], java.util.List, int, int, java.lang.String[], int[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter#SimpleExpandableListAdapter(android.content.Context,%20java.util.List,%20int,%20int,%20java.lang.String[],%20int[],%20java.util.List,%20int,%20java.lang.String[],%20int[])" title="Reference documentation">Java documentation for <code>android.widget.SimpleExpandableListAdapter.SimpleExpandableListAdapter(android.content.Context, java.util.List, int, int, java.lang.String[], int[], java.util.List, int, java.lang.String[], int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/SlidingDrawer.xml b/docs/Mono.Android/en/Android.Widget/SlidingDrawer.xml
index 672a8039a2..459cc5f6fb 100644
--- a/docs/Mono.Android/en/Android.Widget/SlidingDrawer.xml
+++ b/docs/Mono.Android/en/Android.Widget/SlidingDrawer.xml
@@ -131,14 +131,16 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The application's environment.</param>
         <param name="attrs">The attributes defined in XML.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
         <summary>Creates a new SlidingDrawer from a specified set of attributes defined in XML.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SlidingDrawer#SlidingDrawer(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.SlidingDrawer.SlidingDrawer(android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SlidingDrawer#SlidingDrawer(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.SlidingDrawer.SlidingDrawer(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -177,15 +179,20 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
         <param name="context">The application's environment.</param>
         <param name="attrs">The attributes defined in XML.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                   supplies default values for the view, used only if
+                   defStyleAttr is 0 or can not be found in the theme. Can be 0
+                   to not look for defaults.</param>
         <summary>Creates a new SlidingDrawer from a specified set of attributes defined in XML.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/SlidingDrawer#SlidingDrawer(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.SlidingDrawer.SlidingDrawer(android.content.Context, android.util.AttributeSet)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/SlidingDrawer#SlidingDrawer(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.SlidingDrawer.SlidingDrawer(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Space.xml b/docs/Mono.Android/en/Android.Widget/Space.xml
index 1361852b31..457afc43a5 100644
--- a/docs/Mono.Android/en/Android.Widget/Space.xml
+++ b/docs/Mono.Android/en/Android.Widget/Space.xml
@@ -99,7 +99,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Space#Space(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Space.Space(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Space#Space(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.Space.Space(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -140,7 +140,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Space#Space(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Space.Space(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Space#Space(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Space.Space(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -183,7 +183,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Space#Space(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Space.Space(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Space#Space(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Space.Space(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Spinner.xml b/docs/Mono.Android/en/Android.Widget/Spinner.xml
index 5c7fceb2d9..299f2db719 100644
--- a/docs/Mono.Android/en/Android.Widget/Spinner.xml
+++ b/docs/Mono.Android/en/Android.Widget/Spinner.xml
@@ -106,14 +106,15 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new spinner with the given context's theme.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <summary>Constructs a new spinner with the given context's theme and the supplied
+            attribute set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,14 +154,16 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new spinner with the given context's theme.</summary>
+        <param name="mode">Constant describing how the user will select choices from
+                        the spinner.</param>
+        <summary>Constructs a new spinner with the given context's theme and the supplied
+            mode of displaying choices.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -217,15 +220,19 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new spinner with the given context's theme.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                                reference to a style resource that supplies default
+                                values for the view. Can be 0 to not look for
+                                defaults.</param>
+        <summary>Constructs a new spinner with the given context's theme, the supplied
+            attribute set, and default style attribute.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -267,16 +274,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="mode">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new spinner with the given context's theme.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                                reference to a style resource that supplies default
+                                values for the view. Can be 0 to not look for defaults.</param>
+        <param name="mode">Constant describing how the user will select choices from the
+                        spinner.</param>
+        <summary>Constructs a new spinner with the given context's theme, the supplied
+            attribute set, and default style attribute.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -319,17 +330,25 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
-        <param name="mode">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                            access the current theme, resources, etc.</param>
-        <summary>Constructs a new spinner with the given context's theme.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                                reference to a style resource that supplies default
+                                values for the view. Can be 0 to not look for
+                                defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                               supplies default values for the view, used only if
+                               defStyleAttr is 0 or can not be found in the theme.
+                               Can be 0 to not look for defaults.</param>
+        <param name="mode">Constant describing how the user will select choices from
+                        the spinner.</param>
+        <summary>Constructs a new spinner with the given context's theme, the supplied
+            attribute set, and default styles.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Spinner#Spinner(android.content.Context,%20android.util.AttributeSet,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Spinner.Spinner(android.content.Context, android.util.AttributeSet, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -372,13 +391,13 @@
         <Parameter Name="popupTheme" Type="Android.Content.Res.Resources+Theme" />
       </Parameters>
       <Docs>
+        <param name="context">The Context the view is running in, through which it can
+                           access the current theme, resources, etc.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="defStyleRes">To be added.</param>
         <param name="mode">To be added.</param>
         <param name="popupTheme">To be added.</param>
-        <param name="context">The Context the view is running in, through which it can
-                           access the current theme, resources, etc.</param>
         <summary>Constructs a new spinner with the given context's theme.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/StackView.xml b/docs/Mono.Android/en/Android.Widget/StackView.xml
index 13e15d94d9..dcd2ab34f8 100644
--- a/docs/Mono.Android/en/Android.Widget/StackView.xml
+++ b/docs/Mono.Android/en/Android.Widget/StackView.xml
@@ -98,7 +98,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/StackView#StackView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.StackView.StackView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/StackView#StackView(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.StackView.StackView(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -162,7 +162,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/StackView#StackView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.StackView.StackView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/StackView#StackView(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.StackView.StackView(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -205,7 +205,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/StackView#StackView(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.StackView.StackView(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/StackView#StackView(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.StackView.StackView(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Switch.xml b/docs/Mono.Android/en/Android.Widget/Switch.xml
index ca24ee850c..4b5bddb2f2 100644
--- a/docs/Mono.Android/en/Android.Widget/Switch.xml
+++ b/docs/Mono.Android/en/Android.Widget/Switch.xml
@@ -93,13 +93,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The Context that will determine this widget's theming.</param>
-        <summary>Construct a new Switch with default styling.</summary>
+        <param name="attrs">Specification of attributes that should deviate from default styling.</param>
+        <summary>Construct a new Switch with default styling, overriding specific style
+            attributes as requested.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Switch#Switch(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Switch.Switch(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Switch#Switch(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.Switch.Switch(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,14 +157,17 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The Context that will determine this widget's theming.</param>
-        <summary>Construct a new Switch with default styling.</summary>
+        <param name="attrs">Specification of attributes that should deviate from the default styling.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <summary>Construct a new Switch with a default style determined by the given theme attribute,
+            overriding specific style attributes as requested.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Switch#Switch(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Switch.Switch(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Switch#Switch(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Switch.Switch(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -198,15 +202,23 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
-        <param name="defStyleRes">To be added.</param>
         <param name="context">The Context that will determine this widget's theming.</param>
-        <summary>Construct a new Switch with default styling.</summary>
+        <param name="attrs">Specification of attributes that should deviate from the
+                   default styling.</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <param name="defStyleRes">A resource identifier of a style resource that
+                   supplies default values for the view, used only if
+                   defStyleAttr is 0 or can not be found in the theme. Can be 0
+                   to not look for defaults.</param>
+        <summary>Construct a new Switch with a default style determined by the given theme
+            attribute or style resource, overriding specific style attributes as
+            requested.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Switch#Switch(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.Switch.Switch(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Switch#Switch(android.content.Context,%20android.util.AttributeSet,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Switch.Switch(android.content.Context, android.util.AttributeSet, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -402,11 +414,14 @@
       <Docs>
         <param name="tf">To be added.</param>
         <param name="style">To be added.</param>
-        <summary>Sets the typeface in which the text should be displayed on the switch.</summary>
+        <summary>Sets the typeface and style in which the text should be displayed on the
+            switch, and turns on the fake bold and italic bits in the Paint if the
+            Typeface that you provided does not have all the bits in the
+            style that you specified.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Switch#setSwitchTypeface(android.graphics.Typeface)" title="Reference documentation">Java documentation for <code>android.widget.Switch.setSwitchTypeface(android.graphics.Typeface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Switch#setSwitchTypeface(android.graphics.Typeface,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Switch.setSwitchTypeface(android.graphics.Typeface, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/TabHost.xml b/docs/Mono.Android/en/Android.Widget/TabHost.xml
index 8d4fc195a1..d15fb48778 100644
--- a/docs/Mono.Android/en/Android.Widget/TabHost.xml
+++ b/docs/Mono.Android/en/Android.Widget/TabHost.xml
@@ -730,12 +730,20 @@
         <Parameter Name="activityGroup" Type="Android.App.LocalActivityManager" />
       </Parameters>
       <Docs>
-        <param name="activityGroup">Used to launch activities for tab content.
-</param>
-        <summary>If you are using <format type="text/html"><a href="https://docs.microsoft.com/en-us/search/index?search=TabHost TabSpec setContent(android content Intent);scope=Xamarin" title="TabHost TabSpec setContent(android content Intent)">TabHost TabSpec setContent(android content Intent)</a></format>, this
- must be called since the activityGroup is needed to launch the local activity.</summary>
+        <param name="activityGroup">Used to launch activities for tab content.</param>
+        <summary>If you are using <c>TabSpec#setContent(android.content.Intent)</c>, this
+            must be called since the activityGroup is needed to launch the local activity.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/android/widget/TabHost#setup(android.app.LocalActivityManager)" title="Reference documentation">Java documentation for <code>android.widget.TabHost.setup(android.app.LocalActivityManager)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
       </Docs>
diff --git a/docs/Mono.Android/en/Android.Widget/TabWidget.xml b/docs/Mono.Android/en/Android.Widget/TabWidget.xml
index 74c78cf79e..0a0bc5d49c 100644
--- a/docs/Mono.Android/en/Android.Widget/TabWidget.xml
+++ b/docs/Mono.Android/en/Android.Widget/TabWidget.xml
@@ -571,14 +571,12 @@
         <Parameter Name="drawable" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="drawable">the divider drawable
-</param>
-        <param name="resId">the resource identifier of the drawable to use as a divider</param>
+        <param name="drawable">the divider drawable</param>
         <summary>Sets the drawable to use as a divider between the tab indicators.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TabWidget#setDividerDrawable(int)" title="Reference documentation">Java documentation for <code>android.widget.TabWidget.setDividerDrawable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TabWidget#setDividerDrawable(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TabWidget.setDividerDrawable(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -661,16 +659,13 @@
         <Parameter Name="drawable" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="drawable">the left strip drawable
-</param>
-        <param name="resId">the resource identifier of the drawable to use as the left
-                         strip drawable</param>
+        <param name="drawable">the left strip drawable</param>
         <summary>Sets the drawable to use as the left part of the strip below the tab
             indicators.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TabWidget#setLeftStripDrawable(int)" title="Reference documentation">Java documentation for <code>android.widget.TabWidget.setLeftStripDrawable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TabWidget#setLeftStripDrawable(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TabWidget.setLeftStripDrawable(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -755,16 +750,13 @@
         <Parameter Name="drawable" Type="Android.Graphics.Drawables.Drawable" />
       </Parameters>
       <Docs>
-        <param name="drawable">the right strip drawable
-</param>
-        <param name="resId">the resource identifier of the drawable to use as the right
-                         strip drawable</param>
+        <param name="drawable">the right strip drawable</param>
         <summary>Sets the drawable to use as the right part of the strip below the tab
             indicators.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TabWidget#setRightStripDrawable(int)" title="Reference documentation">Java documentation for <code>android.widget.TabWidget.setRightStripDrawable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TabWidget#setRightStripDrawable(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TabWidget.setRightStripDrawable(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/TableLayout.xml b/docs/Mono.Android/en/Android.Widget/TableLayout.xml
index c9e5f0874a..f0d01d9b9f 100644
--- a/docs/Mono.Android/en/Android.Widget/TableLayout.xml
+++ b/docs/Mono.Android/en/Android.Widget/TableLayout.xml
@@ -92,13 +92,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">the application environment</param>
-        <summary>Creates a new TableLayout for the given context.</summary>
+        <param name="attrs">a collection of attributes</param>
+        <summary>Creates a new TableLayout for the given context and with the
+            specified set attributes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TableLayout#TableLayout(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.TableLayout.TableLayout(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TableLayout#TableLayout(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.TableLayout.TableLayout(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/TableRow.xml b/docs/Mono.Android/en/Android.Widget/TableRow.xml
index efa4047757..3faf8cab37 100644
--- a/docs/Mono.Android/en/Android.Widget/TableRow.xml
+++ b/docs/Mono.Android/en/Android.Widget/TableRow.xml
@@ -92,13 +92,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">the application environment</param>
-        <summary>Creates a new TableRow for the given context.</summary>
+        <param name="attrs">a collection of attributes</param>
+        <summary>Creates a new TableRow for the given context and with the
+            specified set attributes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TableRow#TableRow(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.TableRow.TableRow(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TableRow#TableRow(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.TableRow.TableRow(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/TextClock.xml b/docs/Mono.Android/en/Android.Widget/TextClock.xml
index 9272216cce..31b43e496c 100644
--- a/docs/Mono.Android/en/Android.Widget/TextClock.xml
+++ b/docs/Mono.Android/en/Android.Widget/TextClock.xml
@@ -94,14 +94,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                    access the current theme, resources, etc.</param>
-        <summary>Creates a new clock using the default patterns for the current locale.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view</param>
+        <summary>Creates a new clock inflated from XML.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextClock#TextClock(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.TextClock.TextClock(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextClock#TextClock(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.TextClock.TextClock(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -158,15 +158,17 @@
         <Parameter Name="defStyleAttr" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="defStyleAttr">To be added.</param>
         <param name="context">The Context the view is running in, through which it can
                    access the current theme, resources, etc.</param>
-        <summary>Creates a new clock using the default patterns for the current locale.</summary>
+        <param name="attrs">The attributes of the XML tag that is inflating the view</param>
+        <param name="defStyleAttr">An attribute in the current theme that contains a
+                   reference to a style resource that supplies default values for
+                   the view. Can be 0 to not look for defaults.</param>
+        <summary>Creates a new clock inflated from XML.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextClock#TextClock(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.TextClock.TextClock(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextClock#TextClock(android.content.Context,%20android.util.AttributeSet,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextClock.TextClock(android.content.Context, android.util.AttributeSet, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -201,11 +203,11 @@
         <Parameter Name="defStyleRes" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="context">The Context the view is running in, through which it can
+                   access the current theme, resources, etc.</param>
         <param name="attrs">To be added.</param>
         <param name="defStyleAttr">To be added.</param>
         <param name="defStyleRes">To be added.</param>
-        <param name="context">The Context the view is running in, through which it can
-                   access the current theme, resources, etc.</param>
         <summary>Creates a new clock using the default patterns for the current locale.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/TextSwitcher.xml b/docs/Mono.Android/en/Android.Widget/TextSwitcher.xml
index fdccba20d9..9cdcc8b365 100644
--- a/docs/Mono.Android/en/Android.Widget/TextSwitcher.xml
+++ b/docs/Mono.Android/en/Android.Widget/TextSwitcher.xml
@@ -93,13 +93,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="context">the application's environment</param>
-        <summary>Creates a new empty TextSwitcher.</summary>
+        <param name="context">the application environment</param>
+        <param name="attrs">a collection of attributes</param>
+        <summary>Creates a new empty TextSwitcher for the given context and with the
+            specified set attributes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextSwitcher#TextSwitcher(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.TextSwitcher.TextSwitcher(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextSwitcher#TextSwitcher(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.TextSwitcher.TextSwitcher(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/TextView.xml b/docs/Mono.Android/en/Android.Widget/TextView.xml
index 4f79e3c734..0ba076d98d 100644
--- a/docs/Mono.Android/en/Android.Widget/TextView.xml
+++ b/docs/Mono.Android/en/Android.Widget/TextView.xml
@@ -360,16 +360,16 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="start">To be added.</param>
-        <param name="end">To be added.</param>
         <param name="text">text to be appended to the already displayed text</param>
-        <summary>Convenience method to append the specified text to the TextView's
+        <param name="start">the index of the first character in the <c>text</c></param>
+        <param name="end">the index of the character following the last character in the <c>text</c></param>
+        <summary>Convenience method to append the specified text slice to the TextView's
             display buffer, upgrading it to <c>android.widget.TextView.BufferType#EDITABLE</c>
             if it was not already editable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#append(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.TextView.append(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.append(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -400,16 +400,16 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="start">To be added.</param>
-        <param name="end">To be added.</param>
         <param name="text">text to be appended to the already displayed text</param>
-        <summary>Convenience method to append the specified text to the TextView's
+        <param name="start">the index of the first character in the <c>text</c></param>
+        <param name="end">the index of the character following the last character in the <c>text</c></param>
+        <summary>Convenience method to append the specified text slice to the TextView's
             display buffer, upgrading it to <c>android.widget.TextView.BufferType#EDITABLE</c>
             if it was not already editable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#append(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.TextView.append(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.append(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -966,8 +966,6 @@
         <ReturnType>Android.Graphics.PorterDuff+Mode</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="tintMode">the blending mode used to apply the tint, may be
-                            <c>null</c> to clear tint</param>
         <summary>Returns the blending mode used to apply the tint to the compound
             drawables, if specified. -or- Specifies the blending mode used to apply the tint specified by
             <c>#setCompoundDrawableTintList(ColorStateList)</c> to the compound
@@ -2690,8 +2688,7 @@
       </ReturnValue>
       <Docs>
         <summary>Returns the hint that is displayed when the text of the TextView
-            is empty. -or- Sets the text to be displayed when the text of the TextView is empty,
-            from a resource.</summary>
+            is empty. -or- Sets the text to be displayed when the text of the TextView is empty.</summary>
         <value>To be added.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -2703,7 +2700,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setHint(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setHint(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setHint(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setHint(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -5633,7 +5630,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setCompoundDrawablesRelativeWithIntrinsicBounds(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setCompoundDrawablesRelativeWithIntrinsicBounds(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setCompoundDrawablesRelativeWithIntrinsicBounds(android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setCompoundDrawablesRelativeWithIntrinsicBounds(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -5727,7 +5724,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setCompoundDrawablesWithIntrinsicBounds(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setCompoundDrawablesWithIntrinsicBounds(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setCompoundDrawablesWithIntrinsicBounds(android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable,%20android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setCompoundDrawablesWithIntrinsicBounds(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -5977,13 +5974,13 @@
       <Docs>
         <param name="error">To be added.</param>
         <param name="icon">To be added.</param>
-        <summary>Sets the right-hand compound drawable of the TextView to the "error"
+        <summary>Sets the right-hand compound drawable of the TextView to the specified
             icon and sets an error message that will be displayed in a popup when
             the TextView has focus.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setError(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setError(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setError(java.lang.CharSequence,%20android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setError(java.lang.CharSequence, android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -6015,13 +6012,13 @@
       <Docs>
         <param name="error">To be added.</param>
         <param name="icon">To be added.</param>
-        <summary>Sets the right-hand compound drawable of the TextView to the "error"
+        <summary>Sets the right-hand compound drawable of the TextView to the specified
             icon and sets an error message that will be displayed in a popup when
             the TextView has focus.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setError(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setError(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setError(java.lang.CharSequence,%20android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setError(java.lang.CharSequence, android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -6097,12 +6094,12 @@
       </Parameters>
       <Docs>
         <param name="filters">To be added.</param>
-        <summary>Sets the list of input filters on the specified Editable,
-            and includes mInput in the list if it is an InputFilter.</summary>
+        <summary>Sets the list of input filters that will be used if the buffer is
+            Editable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setFilters(android.text.Editable,%20android.text.InputFilter[])" title="Reference documentation">Java documentation for <code>android.widget.TextView.setFilters(android.text.Editable, android.text.InputFilter[])</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setFilters(android.text.InputFilter[])" title="Reference documentation">Java documentation for <code>android.widget.TextView.setFilters(android.text.InputFilter[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6340,11 +6337,11 @@
       </Parameters>
       <Docs>
         <param name="colors">To be added.</param>
-        <summary>Sets the color of the hint text for all the states (disabled, focussed, selected.</summary>
+        <summary>Sets the color of the hint text.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setHintTextColor(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setHintTextColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setHintTextColor(android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setHintTextColor(android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
@@ -6742,7 +6739,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setLinkTextColor(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setLinkTextColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setLinkTextColor(android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setLinkTextColor(android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
@@ -7482,12 +7479,13 @@
       </Parameters>
       <Docs>
         <param name="singleLine">To be added.</param>
-        <summary>Sets the properties of this field (lines, horizontally scrolling,
-            transformation method) to be for a single-line input.</summary>
+        <summary>If true, sets the properties of this field (number of lines, horizontally scrolling,
+            transformation method) to be for a single-line input; if false, restores these to the default
+            conditions.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setSingleLine()" title="Reference documentation">Java documentation for <code>android.widget.TextView.setSingleLine()</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setSingleLine(boolean)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setSingleLine(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -7606,7 +7604,6 @@
       <Docs>
         <param name="text">To be added.</param>
         <param name="type">To be added.</param>
-        <param name="resid">the resource identifier of the string resource to be displayed</param>
         <summary>Sets the text to be displayed using a string resource identifier.</summary>
         <remarks>
           <para>
@@ -7647,8 +7644,8 @@
         <Parameter Name="type" Type="Android.Widget.TextView+BufferType" />
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
         <param name="resid">the resource identifier of the string resource to be displayed</param>
+        <param name="type">To be added.</param>
         <summary>Sets the text to be displayed using a string resource identifier.</summary>
         <remarks>
           <para>
@@ -7685,7 +7682,6 @@
       <Docs>
         <param name="text">To be added.</param>
         <param name="type">To be added.</param>
-        <param name="resid">the resource identifier of the string resource to be displayed</param>
         <summary>Sets the text to be displayed using a string resource identifier.</summary>
         <remarks>
           <para>
@@ -7726,15 +7722,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="start">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="resid">the resource identifier of the string resource to be displayed</param>
-        <summary>Sets the text to be displayed using a string resource identifier.</summary>
+        <param name="text">char array to be displayed</param>
+        <param name="start">start index in the char array</param>
+        <param name="len">length of char count after <c>start</c></param>
+        <summary>Sets the TextView to display the specified slice of the specified
+            char array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setText(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setText(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setText(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setText(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -7815,11 +7811,12 @@
       <Docs>
         <param name="context">To be added.</param>
         <param name="resId">the resource identifier of the style to apply</param>
-        <summary>Sets the text appearance from the specified style resource.</summary>
+        <summary>Sets the text color, size, style, hint color, and highlight color
+            from the specified TextAppearance resource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTextAppearance(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextAppearance(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTextAppearance(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextAppearance(android.content.Context, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -7855,15 +7852,11 @@
       </Parameters>
       <Docs>
         <param name="colors">To be added.</param>
-        <param name="color">A color value in the form 0xAARRGGBB.
-            Do not pass a resource ID. To get a color value from a resource ID, call
-            <c>android.support.v4.content.ContextCompat#getColor(Context, int) getColor</c>.</param>
-        <summary>Sets the text color for all the states (normal, selected,
-            focused) to be this color.</summary>
+        <summary>Sets the text color.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTextColor(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextColor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTextColor(android.content.res.ColorStateList)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextColor(android.content.res.ColorStateList)</code>.</a>
             </format>
           </para>
           <para>
@@ -8101,8 +8094,8 @@
         <Parameter Name="type" Type="Android.Widget.TextView+BufferType" />
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
         <param name="text">text to be displayed</param>
+        <param name="type">To be added.</param>
         <summary>Sets the text to be displayed but retains the cursor position.</summary>
         <remarks>
           <para>
@@ -8138,8 +8131,8 @@
         <Parameter Name="type" Type="Android.Widget.TextView+BufferType" />
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
         <param name="text">text to be displayed</param>
+        <param name="type">To be added.</param>
         <summary>Sets the text to be displayed but retains the cursor position.</summary>
         <remarks>
           <para>
@@ -8307,13 +8300,12 @@
       </Parameters>
       <Docs>
         <param name="unit">The desired dimension unit.</param>
-        <param name="size">The scaled pixel size.</param>
-        <summary>Set the default text size to the given value, interpreted as "scaled
-            pixel" units.</summary>
+        <param name="size">The desired size in the given units.</param>
+        <summary>Set the default text size to a given unit and value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSize(float)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSize(float)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSize(int,%20float)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSize(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -8358,11 +8350,14 @@
       <Docs>
         <param name="tf">To be added.</param>
         <param name="style">To be added.</param>
-        <summary>Sets the typeface and style in which the text should be displayed.</summary>
+        <summary>Sets the typeface and style in which the text should be displayed,
+            and turns on the fake bold and italic bits in the Paint if the
+            Typeface that you provided does not have all the bits in the
+            style that you specified.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTypeface(android.graphics.Typeface)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTypeface(android.graphics.Typeface)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTypeface(android.graphics.Typeface,%20int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTypeface(android.graphics.Typeface, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -8783,7 +8778,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTextCursorDrawable(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextCursorDrawable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTextCursorDrawable(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextCursorDrawable(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -8854,8 +8849,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resid">the resource identifier of the string resource to be displayed</param>
-        <summary>Return the text that TextView is displaying. -or- Sets the text to be displayed using a string resource identifier.</summary>
+        <param name="text">text to be displayed</param>
+        <summary>Return the text that TextView is displaying. -or- Sets the text to be displayed.</summary>
         <value>The text displayed by the text view.</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -8867,7 +8862,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setText(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setText(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setText(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setText(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -9065,7 +9060,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSelectHandle(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSelectHandle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSelectHandle(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSelectHandle(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -9114,7 +9109,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSelectHandleLeft(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSelectHandleLeft(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSelectHandleLeft(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSelectHandleLeft(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -9163,7 +9158,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSelectHandleRight(int)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSelectHandleRight(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/TextView#setTextSelectHandleRight(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.TextView.setTextSelectHandleRight(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Toast.xml b/docs/Mono.Android/en/Android.Widget/Toast.xml
index a27b15894d..ed955e45a4 100644
--- a/docs/Mono.Android/en/Android.Widget/Toast.xml
+++ b/docs/Mono.Android/en/Android.Widget/Toast.xml
@@ -355,18 +355,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="text">The text to show.  Can be formatted text.</param>
         <param name="context">The context to use.  Usually your <c>android.app.Application</c>
                             or <c>android.app.Activity</c> object.</param>
-        <param name="resId">The resource id of the string resource to use.  Can be formatted text.</param>
+        <param name="text">The text to show.  Can be formatted text.</param>
         <param name="duration">How long to display the message.  Either <c>#LENGTH_SHORT</c> or
                             <c>#LENGTH_LONG</c></param>
-        <summary>Make a standard toast that just contains text from a resource.</summary>
+        <summary>Make a standard toast that just contains text.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toast#makeText(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Toast.makeText(android.content.Context, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toast#makeText(android.content.Context,%20java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Toast.makeText(android.content.Context, java.lang.CharSequence, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -459,18 +458,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
         <param name="context">The context to use.  Usually your <c>android.app.Application</c>
                             or <c>android.app.Activity</c> object.</param>
-        <param name="resId">The resource id of the string resource to use.  Can be formatted text.</param>
+        <param name="text">The text to show.  Can be formatted text.</param>
         <param name="duration">How long to display the message.  Either <c>#LENGTH_SHORT</c> or
                             <c>#LENGTH_LONG</c></param>
-        <summary>Make a standard toast that just contains text from a resource.</summary>
+        <summary>Make a standard toast that just contains text.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toast#makeText(android.content.Context,%20int,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Toast.makeText(android.content.Context, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toast#makeText(android.content.Context,%20java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>android.widget.Toast.makeText(android.content.Context, java.lang.CharSequence, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -642,14 +640,12 @@
         <Parameter Name="s" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="s">The new text for the Toast.
-</param>
-        <param name="resId">The new text for the Toast.</param>
+        <param name="s">The new text for the Toast.</param>
         <summary>Update the text in a Toast that was previously created using one of the makeText() methods.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toast#setText(int)" title="Reference documentation">Java documentation for <code>android.widget.Toast.setText(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toast#setText(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.Toast.setText(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -718,13 +714,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="resId">The new text for the Toast.</param>
+        <param name="s">The new text for the Toast.</param>
         <summary>Update the text in a Toast that was previously created using one of the makeText() methods.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toast#setText(int)" title="Reference documentation">Java documentation for <code>android.widget.Toast.setText(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toast#setText(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.Toast.setText(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/Toolbar.xml b/docs/Mono.Android/en/Android.Widget/Toolbar.xml
index 6d6d537799..10048b94a2 100644
--- a/docs/Mono.Android/en/Android.Widget/Toolbar.xml
+++ b/docs/Mono.Android/en/Android.Widget/Toolbar.xml
@@ -260,8 +260,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">Resource ID of a content description string to set, or 0 to
-                         clear the description</param>
+        <param name="description">Content description to set, or &lt;code&gt;null&lt;/code&gt; to
+                               clear the content description</param>
         <summary>Retrieve the currently configured content description for the collapse button view. -or- Set a content description for the collapse button if one is present.</summary>
         <value>The collapse button's content description</value>
         <remarks>
@@ -274,7 +274,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setCollapseContentDescription(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setCollapseContentDescription(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setCollapseContentDescription(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setCollapseContentDescription(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -309,7 +309,7 @@
         <ReturnType>Android.Graphics.Drawables.Drawable</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">Resource ID of a drawable to set</param>
+        <param name="icon">Drawable to set, may be null to use the default icon</param>
         <summary>Return the current drawable used as the collapse icon. -or- Set the icon to use for the toolbar's collapse button.</summary>
         <value>The collapse icon drawable</value>
         <remarks>
@@ -322,7 +322,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setCollapseIcon(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setCollapseIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setCollapseIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setCollapseIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -982,8 +982,8 @@
         <ReturnType>Android.Graphics.Drawables.Drawable</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">ID of a drawable resource</param>
-        <summary>Return the current logo drawable. -or- Set a logo drawable from a resource id.</summary>
+        <param name="drawable">Drawable to use as a logo</param>
+        <summary>Return the current logo drawable. -or- Set a logo drawable.</summary>
         <value>The current logo drawable</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -995,7 +995,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setLogo(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setLogo(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setLogo(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setLogo(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1053,7 +1053,7 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">String resource id</param>
+        <param name="description">Description to set</param>
         <summary>Return the description of the toolbar's logo. -or- Set a description of the toolbar's logo.</summary>
         <value>A description of the logo</value>
         <remarks>
@@ -1066,7 +1066,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setLogoDescription(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setLogoDescription(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setLogoDescription(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setLogoDescription(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1178,8 +1178,8 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">Resource ID of a content description string to set, or 0 to
-                         clear the description</param>
+        <param name="description">Content description to set, or &lt;code&gt;null&lt;/code&gt; to
+                               clear the content description</param>
         <summary>Retrieve the currently configured content description for the navigation button view. -or- Set a content description for the navigation button if one is present.</summary>
         <value>The navigation button's content description</value>
         <remarks>
@@ -1192,7 +1192,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setNavigationContentDescription(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setNavigationContentDescription(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setNavigationContentDescription(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setNavigationContentDescription(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1227,7 +1227,7 @@
         <ReturnType>Android.Graphics.Drawables.Drawable</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">Resource ID of a drawable to set</param>
+        <param name="icon">Drawable to set, may be null to clear the icon</param>
         <summary>Return the current drawable used as the navigation icon. -or- Set the icon to use for the toolbar's navigation button.</summary>
         <value>The navigation icon drawable</value>
         <remarks>
@@ -1240,7 +1240,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setNavigationIcon(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setNavigationIcon(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setNavigationIcon(android.graphics.drawable.Drawable)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setNavigationIcon(android.graphics.drawable.Drawable)</code>.</a>
             </format>
           </para>
           <para>
@@ -2184,7 +2184,7 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">String resource ID</param>
+        <param name="subtitle">Subtitle to set</param>
         <summary>Return the subtitle of this toolbar. -or- Set the subtitle of this toolbar.</summary>
         <value>The current subtitle</value>
         <remarks>
@@ -2197,7 +2197,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setSubtitle(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setSubtitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setSubtitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setSubtitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -2315,7 +2315,7 @@
         <ReturnType>Java.Lang.ICharSequence</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="resId">Resource ID of a string to set as the title</param>
+        <param name="title">Title to set</param>
         <summary>Returns the title of this toolbar. -or- Set the title of this toolbar.</summary>
         <value>The current title.</value>
         <remarks>
@@ -2328,7 +2328,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/Toolbar#setTitle(int)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setTitle(int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/Toolbar#setTitle(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>android.widget.Toolbar.setTitle(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/VideoView.xml b/docs/Mono.Android/en/Android.Widget/VideoView.xml
index 1fae67f669..c22b060dd5 100644
--- a/docs/Mono.Android/en/Android.Widget/VideoView.xml
+++ b/docs/Mono.Android/en/Android.Widget/VideoView.xml
@@ -1133,13 +1133,17 @@
         <Parameter Name="headers" Type="System.Collections.Generic.IDictionary&lt;System.String,System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="headers">To be added.</param>
         <param name="uri">the URI of the video.</param>
-        <summary>Sets video URI.</summary>
+        <param name="headers">the headers for the URI request.
+                           Note that the cross domain redirection is allowed by default, but that can be
+                           changed with key/value pairs through the headers parameter with
+                           "android-allow-cross-domain-redirect" as the key and "0" or "1" as the value
+                           to disallow or allow cross domain redirection.</param>
+        <summary>Sets video URI using specific headers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/VideoView#setVideoURI(android.net.Uri)" title="Reference documentation">Java documentation for <code>android.widget.VideoView.setVideoURI(android.net.Uri)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/VideoView#setVideoURI(android.net.Uri,%20java.util.Map)" title="Reference documentation">Java documentation for <code>android.widget.VideoView.setVideoURI(android.net.Uri, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ViewAnimator.xml b/docs/Mono.Android/en/Android.Widget/ViewAnimator.xml
index 5a9f90aa4b..34de61e0e1 100644
--- a/docs/Mono.Android/en/Android.Widget/ViewAnimator.xml
+++ b/docs/Mono.Android/en/Android.Widget/ViewAnimator.xml
@@ -269,8 +269,7 @@
         <ReturnType>Android.Views.Animations.Animation</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="context">The application's environment.</param>
-        <param name="resourceID">The resource id of the animation.</param>
+        <param name="inAnimation">The animation started when a View enters the screen.</param>
         <summary>Returns the current animation used to animate a View that enters the screen. -or- Specifies the animation used to animate a View that enters the screen.</summary>
         <value>An Animation or null if none is set.</value>
         <remarks>
@@ -283,7 +282,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ViewAnimator#setInAnimation(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ViewAnimator.setInAnimation(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ViewAnimator#setInAnimation(android.view.animation.Animation)" title="Reference documentation">Java documentation for <code>android.widget.ViewAnimator.setInAnimation(android.view.animation.Animation)</code>.</a>
             </format>
           </para>
           <para>
@@ -354,8 +353,7 @@
         <ReturnType>Android.Views.Animations.Animation</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="context">The application's environment.</param>
-        <param name="resourceID">The resource id of the animation.</param>
+        <param name="outAnimation">The animation started when a View exit the screen.</param>
         <summary>Returns the current animation used to animate a View that exits the screen. -or- Specifies the animation used to animate a View that exit the screen.</summary>
         <value>An Animation or null if none is set.</value>
         <remarks>
@@ -368,7 +366,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ViewAnimator#setOutAnimation(android.content.Context,%20int)" title="Reference documentation">Java documentation for <code>android.widget.ViewAnimator.setOutAnimation(android.content.Context, int)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ViewAnimator#setOutAnimation(android.view.animation.Animation)" title="Reference documentation">Java documentation for <code>android.widget.ViewAnimator.setOutAnimation(android.view.animation.Animation)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Android.Widget/ViewSwitcher.xml b/docs/Mono.Android/en/Android.Widget/ViewSwitcher.xml
index 3cebd3f6a0..47927ebf0d 100644
--- a/docs/Mono.Android/en/Android.Widget/ViewSwitcher.xml
+++ b/docs/Mono.Android/en/Android.Widget/ViewSwitcher.xml
@@ -94,13 +94,14 @@
         <Parameter Name="attrs" Type="Android.Util.IAttributeSet" />
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
-        <param name="context">the application's environment</param>
-        <summary>Creates a new empty ViewSwitcher.</summary>
+        <param name="context">the application environment</param>
+        <param name="attrs">a collection of attributes</param>
+        <summary>Creates a new empty ViewSwitcher for the given context and with the
+            specified set attributes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/android/widget/ViewSwitcher#ViewSwitcher(android.content.Context)" title="Reference documentation">Java documentation for <code>android.widget.ViewSwitcher.ViewSwitcher(android.content.Context)</code>.</a>
+              <a href="https://developer.android.com/reference/android/widget/ViewSwitcher#ViewSwitcher(android.content.Context,%20android.util.AttributeSet)" title="Reference documentation">Java documentation for <code>android.widget.ViewSwitcher.ViewSwitcher(android.content.Context, android.util.AttributeSet)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/FrameworksIndex/xamarin-android-sdk-12.xml b/docs/Mono.Android/en/FrameworksIndex/xamarin-android-sdk-12.xml
index 3022d4d5a3..293ba8b8c3 100644
--- a/docs/Mono.Android/en/FrameworksIndex/xamarin-android-sdk-12.xml
+++ b/docs/Mono.Android/en/FrameworksIndex/xamarin-android-sdk-12.xml
@@ -74354,6 +74354,8 @@
       <Member Id="M:Android.Telephony.Data.ApnSetting.DescribeContents" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.WriteToParcel(Android.OS.Parcel,Android.OS.ParcelableWriteFlags)" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.ApnName" />
+      <Member Id="P:Android.Telephony.Data.ApnSetting.ApnTypeBitmask" />
+      <Member Id="P:Android.Telephony.Data.ApnSetting.AuthType" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.CarrierId" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.Creator" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.EntryName" />
@@ -74364,12 +74366,15 @@
       <Member Id="P:Android.Telephony.Data.ApnSetting.MmsProxyAddress" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.MmsProxyAddressAsString" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.MmsProxyPort" />
+      <Member Id="P:Android.Telephony.Data.ApnSetting.MvnoType" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.NetworkTypeBitmask" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.OperatorNumeric" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.Password" />
+      <Member Id="P:Android.Telephony.Data.ApnSetting.Protocol" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.ProxyAddress" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.ProxyAddressAsString" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.ProxyPort" />
+      <Member Id="P:Android.Telephony.Data.ApnSetting.RoamingProtocol" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.ThresholdClass" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.ThresholdType" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.User" />
@@ -74379,6 +74384,8 @@
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.#ctor(System.IntPtr,Android.Runtime.JniHandleOwnership)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.Build" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetApnName(System.String)" />
+      <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetApnTypeBitmask(Android.Telephony.Data.ApnType)" />
+      <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetAuthType(Android.Telephony.Data.AuthType)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetCarrierEnabled(System.Boolean)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetCarrierId(System.Int32)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetEntryName(System.String)" />
@@ -74386,12 +74393,15 @@
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetMmsProxyAddress(Java.Net.InetAddress)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetMmsProxyAddress(System.String)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetMmsProxyPort(System.Int32)" />
+      <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetMvnoType(Android.Telephony.Data.MvnoType)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetNetworkTypeBitmask(Android.Telephony.NetworkType)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetOperatorNumeric(System.String)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetPassword(System.String)" />
+      <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetProtocol(Android.Telephony.Data.Protocols)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetProxyAddress(Java.Net.InetAddress)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetProxyAddress(System.String)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetProxyPort(System.Int32)" />
+      <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetRoamingProtocol(Android.Telephony.Data.Protocols)" />
       <Member Id="M:Android.Telephony.Data.ApnSetting.Builder.SetUser(System.String)" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.Builder.JniPeerMembers" />
       <Member Id="P:Android.Telephony.Data.ApnSetting.Builder.ThresholdClass" />
@@ -94076,6 +94086,7 @@
       <Member Id="M:Java.Interop.JavaObjectArray`1.#ctor(System.Int32)" />
       <Member Id="M:Java.Interop.JavaObjectArray`1.Clear" />
       <Member Id="M:Java.Interop.JavaObjectArray`1.CopyTo(`0[],System.Int32)" />
+      <Member Id="M:Java.Interop.JavaObjectArray`1.DisposeUnlessReferenced" />
       <Member Id="M:Java.Interop.JavaObjectArray`1.GetEnumerator" />
       <Member Id="M:Java.Interop.JavaObjectArray`1.IndexOf(`0)" />
       <Member Id="P:Java.Interop.JavaObjectArray`1.Item(System.Int32)" />
@@ -94097,6 +94108,7 @@
       <Member Id="M:Java.Interop.JavaPrimitiveArray`1.CopyTo(`0[],System.Int32)" />
       <Member Id="M:Java.Interop.JavaPrimitiveArray`1.CopyTo(System.Int32,`0[],System.Int32,System.Int32)" />
       <Member Id="M:Java.Interop.JavaPrimitiveArray`1.CreateElements" />
+      <Member Id="M:Java.Interop.JavaPrimitiveArray`1.DisposeUnlessReferenced" />
       <Member Id="M:Java.Interop.JavaPrimitiveArray`1.GetElements" />
       <Member Id="P:Java.Interop.JavaPrimitiveArray`1.Item(System.Int32)" />
     </Type>
@@ -94187,6 +94199,15 @@
       <Member Id="P:Java.Interop.JniEnvironment.WithinNewObjectScope" />
     </Type>
     <Type Name="Java.Interop.JniEnvironment/Arrays" Id="T:Java.Interop.JniEnvironment.Arrays">
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalBooleanArray(System.Collections.Generic.IEnumerable{System.Boolean})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalCharArray(System.Collections.Generic.IEnumerable{System.Char})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalDoubleArray(System.Collections.Generic.IEnumerable{System.Double})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalInt16Array(System.Collections.Generic.IEnumerable{System.Int16})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalInt32Array(System.Collections.Generic.IEnumerable{System.Int32})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalInt64Array(System.Collections.Generic.IEnumerable{System.Int64})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalObjectArray``1(System.Collections.Generic.IEnumerable{``0})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalSByteArray(System.Collections.Generic.IEnumerable{System.SByte})" />
+      <Member Id="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalSingleArray(System.Collections.Generic.IEnumerable{System.Single})" />
       <Member Id="M:Java.Interop.JniEnvironment.Arrays.GetArrayLength(Java.Interop.JniObjectReference)" />
       <Member Id="M:Java.Interop.JniEnvironment.Arrays.GetBooleanArrayElements(Java.Interop.JniObjectReference,System.Boolean*)" />
       <Member Id="M:Java.Interop.JniEnvironment.Arrays.GetBooleanArrayRegion(Java.Interop.JniObjectReference,System.Int32,System.Int32,System.Boolean*)" />
diff --git a/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml b/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml
index 87a4954364..43cadadb18 100644
--- a/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml
+++ b/docs/Mono.Android/en/Java.Awt.Font/NumericShaper.xml
@@ -415,14 +415,15 @@
         <Parameter Name="defaultContext" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="defaultContext">the default, starting context.</param>
         <param name="ranges">the specified Unicode ranges</param>
+        <param name="defaultContext">the starting context, such as
+            &lt;code&gt;NumericShaper.EUROPEAN&lt;/code&gt;</param>
         <summary>Returns a contextual shaper for the provided unicode range(s).</summary>
-        <returns>a shaper for the specified ranges</returns>
+        <returns>a shaper for the specified Unicode ranges.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/awt/font/NumericShaper#getContextualShaper(int)" title="Reference documentation">Java documentation for <code>java.awt.font.NumericShaper.getContextualShaper(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/awt/font/NumericShaper#getContextualShaper(int,%20int)" title="Reference documentation">Java documentation for <code>java.awt.font.NumericShaper.getContextualShaper(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1072,12 +1073,12 @@
         <Parameter Name="context" Type="Java.Awt.Font.NumericShaper+Range" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
         <param name="text">an array of characters to convert</param>
         <param name="start">the index into &lt;code&gt;text&lt;/code&gt; to start
                    converting</param>
         <param name="count">the number of characters in &lt;code&gt;text&lt;/code&gt;
                    to convert</param>
+        <param name="context">To be added.</param>
         <summary>Converts the digits in the text that occur between start and
             start + count.</summary>
         <remarks>
@@ -1120,19 +1121,19 @@
         <Parameter Name="context" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="context">the context to be used for shaping.
-</param>
-        <param name="text">an array of characters to convert</param>
+        <param name="text">an array of characters</param>
         <param name="start">the index into &lt;code&gt;text&lt;/code&gt; to start
                    converting</param>
         <param name="count">the number of characters in &lt;code&gt;text&lt;/code&gt;
                    to convert</param>
+        <param name="context">the context to which to convert the
+                   characters, such as &lt;code&gt;NumericShaper.EUROPEAN&lt;/code&gt;</param>
         <summary>Converts the digits in the text that occur between start and
-            start + count.</summary>
+            start + count, using the provided context.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/awt/font/NumericShaper#shape(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.awt.font.NumericShaper.shape(char[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/awt/font/NumericShaper#shape(char[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.awt.font.NumericShaper.shape(char[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml b/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml
index 75fa0afa57..f246f48932 100644
--- a/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml
+++ b/docs/Mono.Android/en/Java.Beans/PropertyChangeSupport.xml
@@ -172,13 +172,13 @@
         <Parameter Name="listener" Type="Java.Beans.IPropertyChangeListener" />
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
+        <param name="propertyName">The name of the property to listen on.</param>
         <param name="listener">The PropertyChangeListener to be added</param>
-        <summary>Add a PropertyChangeListener to the listener list.</summary>
+        <summary>Add a PropertyChangeListener for a specific property.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#addPropertyChangeListener(java.beans.PropertyChangeListener)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.addPropertyChangeListener(java.beans.PropertyChangeListener)</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#addPropertyChangeListener(java.lang.String,%20java.beans.PropertyChangeListener)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)</code>.</a>
             </format>
           </para>
           <para>
@@ -220,13 +220,13 @@
         <param name="index">the index of the property element that was changed</param>
         <param name="oldValue">the old value of the property</param>
         <param name="newValue">the new value of the property</param>
-        <summary>Reports an integer bound indexed property update to listeners
+        <summary>Reports a bound indexed property update to listeners
             that have been registered to track updates of
             all properties or a property with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#fireIndexedPropertyChange(java.lang.String,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.fireIndexedPropertyChange(java.lang.String, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#fireIndexedPropertyChange(java.lang.String,%20int,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.fireIndexedPropertyChange(java.lang.String, int, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -268,13 +268,13 @@
         <param name="index">the index of the property element that was changed</param>
         <param name="oldValue">the old value of the property</param>
         <param name="newValue">the new value of the property</param>
-        <summary>Reports an integer bound indexed property update to listeners
+        <summary>Reports a boolean bound indexed property update to listeners
             that have been registered to track updates of
             all properties or a property with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#fireIndexedPropertyChange(java.lang.String,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.fireIndexedPropertyChange(java.lang.String, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#fireIndexedPropertyChange(java.lang.String,%20int,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.fireIndexedPropertyChange(java.lang.String, int, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -402,18 +402,16 @@
         <Parameter Name="newValue" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="propertyName">the name of the property</param>
+        <param name="propertyName">the programmatic name of the property that was changed</param>
         <param name="oldValue">the old value of the property</param>
-        <param name="newValue">the new value of the property
-</param>
-        <param name="event">the <c>PropertyChangeEvent</c> to be fired</param>
-        <summary>Fires a property change event to listeners
+        <param name="newValue">the new value of the property</param>
+        <summary>Reports a bound property update to listeners
             that have been registered to track updates of
             all properties or a property with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#firePropertyChange(java.beans.PropertyChangeEvent)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.firePropertyChange(java.beans.PropertyChangeEvent)</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#firePropertyChange(java.lang.String,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.firePropertyChange(java.lang.String, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -450,18 +448,16 @@
         <Parameter Name="newValue" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="propertyName">the property name</param>
-        <param name="oldValue">the old value</param>
-        <param name="newValue">the new value
-</param>
-        <param name="event">the <c>PropertyChangeEvent</c> to be fired</param>
-        <summary>Fires a property change event to listeners
+        <param name="propertyName">the programmatic name of the property that was changed</param>
+        <param name="oldValue">the old value of the property</param>
+        <param name="newValue">the new value of the property</param>
+        <summary>Reports a boolean bound property update to listeners
             that have been registered to track updates of
             all properties or a property with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#firePropertyChange(java.beans.PropertyChangeEvent)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.firePropertyChange(java.beans.PropertyChangeEvent)</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#firePropertyChange(java.lang.String,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.firePropertyChange(java.lang.String, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -498,18 +494,16 @@
         <Parameter Name="newValue" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="propertyName">the property name</param>
-        <param name="oldValue">the old value</param>
-        <param name="newValue">the new value
-</param>
-        <param name="event">the <c>PropertyChangeEvent</c> to be fired</param>
-        <summary>Fires a property change event to listeners
+        <param name="propertyName">the programmatic name of the property that was changed</param>
+        <param name="oldValue">the old value of the property</param>
+        <param name="newValue">the new value of the property</param>
+        <summary>Reports an integer bound property update to listeners
             that have been registered to track updates of
             all properties or a property with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#firePropertyChange(java.beans.PropertyChangeEvent)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.firePropertyChange(java.beans.PropertyChangeEvent)</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#firePropertyChange(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.firePropertyChange(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -584,15 +578,17 @@
         <Parameter Name="propertyName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
-        <summary>Returns an array of all the listeners that were added to the
-            PropertyChangeSupport object with addPropertyChangeListener().</summary>
-        <returns>all of the &lt;code&gt;PropertyChangeListeners&lt;/code&gt; added or an
-                    empty array if no listeners have been added</returns>
+        <param name="propertyName">The name of the property being listened to</param>
+        <summary>Returns an array of all the listeners which have been associated
+            with the named property.</summary>
+        <returns>all of the &lt;code&gt;PropertyChangeListeners&lt;/code&gt; associated with
+                    the named property.  If no such listeners have been added,
+                    or if &lt;code&gt;propertyName&lt;/code&gt; is null, an empty array is
+                    returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#getPropertyChangeListeners()" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.getPropertyChangeListeners()</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#getPropertyChangeListeners(java.lang.String)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.getPropertyChangeListeners(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -744,13 +740,13 @@
         <Parameter Name="listener" Type="Java.Beans.IPropertyChangeListener" />
       </Parameters>
       <Docs>
-        <param name="propertyName">To be added.</param>
+        <param name="propertyName">The name of the property that was listened on.</param>
         <param name="listener">The PropertyChangeListener to be removed</param>
-        <summary>Remove a PropertyChangeListener from the listener list.</summary>
+        <summary>Remove a PropertyChangeListener for a specific property.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#removePropertyChangeListener(java.beans.PropertyChangeListener)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.removePropertyChangeListener(java.beans.PropertyChangeListener)</code>.</a>
+              <a href="https://developer.android.com/reference/java/beans/PropertyChangeSupport#removePropertyChangeListener(java.lang.String,%20java.beans.PropertyChangeListener)" title="Reference documentation">Java documentation for <code>java.beans.PropertyChangeSupport.removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml b/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml
index 0bb2a70118..489687a3e9 100644
--- a/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/BufferedInputStream.xml
@@ -121,15 +121,16 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
         <param name="in">the underlying input stream.</param>
+        <param name="size">the buffer size.</param>
         <summary>Creates a &lt;code&gt;BufferedInputStream&lt;/code&gt;
+            with the specified buffer size,
             and saves its  argument, the input stream
             &lt;code&gt;in&lt;/code&gt;, for later use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/BufferedInputStream#BufferedInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.BufferedInputStream.BufferedInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/BufferedInputStream#BufferedInputStream(java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.io.BufferedInputStream.BufferedInputStream(java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/BufferedOutputStream.xml b/docs/Mono.Android/en/Java.IO/BufferedOutputStream.xml
index 6d9b34cfb8..b42e4138e4 100644
--- a/docs/Mono.Android/en/Java.IO/BufferedOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/BufferedOutputStream.xml
@@ -116,14 +116,15 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
         <param name="out">the underlying output stream.</param>
+        <param name="size">the buffer size.</param>
         <summary>Creates a new buffered output stream to write data to the
-            specified underlying output stream.</summary>
+            specified underlying output stream with the specified buffer
+            size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/BufferedOutputStream#BufferedOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.io.BufferedOutputStream.BufferedOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/BufferedOutputStream#BufferedOutputStream(java.io.OutputStream,%20int)" title="Reference documentation">Java documentation for <code>java.io.BufferedOutputStream.BufferedOutputStream(java.io.OutputStream, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/BufferedReader.xml b/docs/Mono.Android/en/Java.IO/BufferedReader.xml
index 87acc60c45..f0dd26d5c9 100644
--- a/docs/Mono.Android/en/Java.IO/BufferedReader.xml
+++ b/docs/Mono.Android/en/Java.IO/BufferedReader.xml
@@ -94,14 +94,14 @@
         <Parameter Name="sz" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sz">To be added.</param>
         <param name="in">A Reader</param>
-        <summary>Creates a buffering character-input stream that uses a default-sized
-            input buffer.</summary>
+        <param name="sz">Input-buffer size</param>
+        <summary>Creates a buffering character-input stream that uses an input buffer of
+            the specified size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/BufferedReader#BufferedReader(java.io.Reader)" title="Reference documentation">Java documentation for <code>java.io.BufferedReader.BufferedReader(java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/BufferedReader#BufferedReader(java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>java.io.BufferedReader.BufferedReader(java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -224,17 +224,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Reads a single character.</summary>
-        <returns>The character read, as an integer in the range
-                    0 to 65535 (<c>0x00-0xffff</c>), or -1 if the
-                    end of the stream has been reached</returns>
+        <param name="cbuf">Destination buffer</param>
+        <param name="off">Offset at which to start storing characters</param>
+        <param name="len">Maximum number of characters to read</param>
+        <summary>Reads characters into a portion of an array.</summary>
+        <returns>The number of characters read, or -1 if the end of the
+                        stream has been reached</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/BufferedReader#read()" title="Reference documentation">Java documentation for <code>java.io.BufferedReader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/BufferedReader#read(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.BufferedReader.read(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/BufferedWriter.xml b/docs/Mono.Android/en/Java.IO/BufferedWriter.xml
index 436afa8af4..ddeca5c71d 100644
--- a/docs/Mono.Android/en/Java.IO/BufferedWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/BufferedWriter.xml
@@ -94,14 +94,14 @@
         <Parameter Name="sz" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sz">To be added.</param>
         <param name="out">A Writer</param>
-        <summary>Creates a buffered character-output stream that uses a default-sized
-            output buffer.</summary>
+        <param name="sz">Output-buffer size, a positive integer</param>
+        <summary>Creates a new buffered character-output stream that uses an output
+            buffer of the given size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/BufferedWriter#BufferedWriter(java.io.Writer)" title="Reference documentation">Java documentation for <code>java.io.BufferedWriter.BufferedWriter(java.io.Writer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/BufferedWriter#BufferedWriter(java.io.Writer,%20int)" title="Reference documentation">Java documentation for <code>java.io.BufferedWriter.BufferedWriter(java.io.Writer, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -386,14 +386,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Writes a single character.</summary>
+        <param name="cbuf">A character array</param>
+        <param name="off">Offset from which to start reading characters</param>
+        <param name="len">Number of characters to write</param>
+        <summary>Writes a portion of an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/BufferedWriter#write(int)" title="Reference documentation">Java documentation for <code>java.io.BufferedWriter.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/BufferedWriter#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.BufferedWriter.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml b/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml
index c7b906e2a0..4149dc14cd 100644
--- a/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/ByteArrayInputStream.xml
@@ -120,16 +120,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
         <param name="buf">the input buffer.</param>
-        <summary>Creates a &lt;code&gt;ByteArrayInputStream&lt;/code&gt;
-            so that it  uses &lt;code&gt;buf&lt;/code&gt; as its
+        <param name="offset">the offset in the buffer of the first byte to read.</param>
+        <param name="length">the maximum number of bytes to read from the buffer.</param>
+        <summary>Creates &lt;code&gt;ByteArrayInputStream&lt;/code&gt;
+            that uses &lt;code&gt;buf&lt;/code&gt; as its
             buffer array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ByteArrayInputStream#ByteArrayInputStream(byte[])" title="Reference documentation">Java documentation for <code>java.io.ByteArrayInputStream.ByteArrayInputStream(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ByteArrayInputStream#ByteArrayInputStream(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.ByteArrayInputStream.ByteArrayInputStream(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml b/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml
index b3a5847228..e817ccb817 100644
--- a/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/ByteArrayOutputStream.xml
@@ -88,12 +88,13 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
-        <summary>Creates a new byte array output stream.</summary>
+        <param name="size">the initial size.</param>
+        <summary>Creates a new byte array output stream, with a buffer capacity of
+            the specified size, in bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ByteArrayOutputStream#ByteArrayOutputStream()" title="Reference documentation">Java documentation for <code>java.io.ByteArrayOutputStream.ByteArrayOutputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ByteArrayOutputStream#ByteArrayOutputStream(int)" title="Reference documentation">Java documentation for <code>java.io.ByteArrayOutputStream.ByteArrayOutputStream(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -440,13 +441,12 @@
       </Parameters>
       <Docs>
         <param name="hibyte">the high byte of each resulting Unicode character.</param>
-        <summary>Converts the buffer's contents into a string decoding bytes using the
-            platform's default character set.</summary>
-        <returns>String decoded from the buffer's contents.</returns>
+        <summary>Creates a newly allocated string.</summary>
+        <returns>the current contents of the output stream, as a string.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ByteArrayOutputStream#toString()" title="Reference documentation">Java documentation for <code>java.io.ByteArrayOutputStream.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ByteArrayOutputStream#toString(int)" title="Reference documentation">Java documentation for <code>java.io.ByteArrayOutputStream.toString(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -481,15 +481,15 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">a string representing the encoding to use when translating
-            this stream to a string.</param>
-        <summary>Converts the buffer's contents into a string decoding bytes using the
-            platform's default character set.</summary>
+        <param name="charsetName">the name of a supported
+                        <c>java.nio.charset.Charset charset</c></param>
+        <summary>Converts the buffer's contents into a string by decoding the bytes using
+            the named <c>java.nio.charset.Charset charset</c>.</summary>
         <returns>String decoded from the buffer's contents.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ByteArrayOutputStream#toString()" title="Reference documentation">Java documentation for <code>java.io.ByteArrayOutputStream.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ByteArrayOutputStream#toString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.ByteArrayOutputStream.toString(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/CharArrayReader.xml b/docs/Mono.Android/en/Java.IO/CharArrayReader.xml
index 8f14b514d0..4dfc3ebc73 100644
--- a/docs/Mono.Android/en/Java.IO/CharArrayReader.xml
+++ b/docs/Mono.Android/en/Java.IO/CharArrayReader.xml
@@ -117,14 +117,14 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
         <param name="buf">Input buffer (not copied)</param>
+        <param name="offset">Offset of the first char to read</param>
+        <param name="length">Number of chars to read</param>
         <summary>Creates a CharArrayReader from the specified array of chars.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/CharArrayReader#CharArrayReader(char[])" title="Reference documentation">Java documentation for <code>java.io.CharArrayReader.CharArrayReader(char[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/CharArrayReader#CharArrayReader(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.CharArrayReader.CharArrayReader(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -381,15 +381,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">the maximum number of characters to read.</param>
-        <summary>Reads a single character.</summary>
-        <returns>To be added.</returns>
+        <param name="b">Destination buffer</param>
+        <param name="off">Offset at which to start storing characters</param>
+        <param name="len">Maximum number of characters to read</param>
+        <summary>Reads characters into a portion of an array.</summary>
+        <returns>The actual number of characters read, or -1 if
+                     the end of the stream has been reached</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/CharArrayReader#read()" title="Reference documentation">Java documentation for <code>java.io.CharArrayReader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/CharArrayReader#read(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.CharArrayReader.read(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/CharArrayWriter.xml b/docs/Mono.Android/en/Java.IO/CharArrayWriter.xml
index b188d6ae13..75d7ddeb7b 100644
--- a/docs/Mono.Android/en/Java.IO/CharArrayWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/CharArrayWriter.xml
@@ -87,12 +87,12 @@
         <Parameter Name="initialSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialSize">To be added.</param>
-        <summary>Creates a new CharArrayWriter.</summary>
+        <param name="initialSize">an int specifying the initial buffer size.</param>
+        <summary>Creates a new CharArrayWriter with the specified initial size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/CharArrayWriter#CharArrayWriter()" title="Reference documentation">Java documentation for <code>java.io.CharArrayWriter.CharArrayWriter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/CharArrayWriter#CharArrayWriter(int)" title="Reference documentation">Java documentation for <code>java.io.CharArrayWriter.CharArrayWriter(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -509,14 +509,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">maximum number of characters to write.</param>
-        <summary>Writes a character to the buffer.</summary>
+        <param name="c">the data to be written</param>
+        <param name="off">the start offset in the data</param>
+        <param name="len">the number of chars that are written</param>
+        <summary>Writes characters to the buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/CharArrayWriter#write(int)" title="Reference documentation">Java documentation for <code>java.io.CharArrayWriter.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/CharArrayWriter#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.CharArrayWriter.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/CharConversionException.xml b/docs/Mono.Android/en/Java.IO/CharConversionException.xml
index ec16905d9d..b4fc4013e5 100644
--- a/docs/Mono.Android/en/Java.IO/CharConversionException.xml
+++ b/docs/Mono.Android/en/Java.IO/CharConversionException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>This provides no detailed message.</summary>
+        <param name="s">the detailed message associated with the exception.</param>
+        <summary>This provides a detailed message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/CharConversionException#CharConversionException()" title="Reference documentation">Java documentation for <code>java.io.CharConversionException.CharConversionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/CharConversionException#CharConversionException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.CharConversionException.CharConversionException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/DataInputStream.xml b/docs/Mono.Android/en/Java.IO/DataInputStream.xml
index f7b03e13e9..27bdbcdabd 100644
--- a/docs/Mono.Android/en/Java.IO/DataInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/DataInputStream.xml
@@ -216,18 +216,18 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the buffer into which the data is read.</param>
-        <summary>Reads some number of bytes from the contained input stream and
-            stores them into the buffer array &lt;code&gt;b&lt;/code&gt;.</summary>
+        <param name="off">the start offset in the destination array &lt;code&gt;b&lt;/code&gt;</param>
+        <param name="len">the maximum number of bytes read.</param>
+        <summary>Reads up to &lt;code&gt;len&lt;/code&gt; bytes of data from the contained
+            input stream into an array of bytes.</summary>
         <returns>the total number of bytes read into the buffer, or
                         &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end
                         of the stream has been reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/DataInputStream#read(byte[])" title="Reference documentation">Java documentation for <code>java.io.DataInputStream.read(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/DataInputStream#read(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.DataInputStream.read(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -532,15 +532,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the buffer into which the data is read.</param>
+        <param name="off">the start offset of the data.</param>
+        <param name="len">the number of bytes to read.</param>
         <summary>See the general contract of the &lt;code&gt;readFully&lt;/code&gt;
             method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/DataInputStream#readFully(byte[])" title="Reference documentation">Java documentation for <code>java.io.DataInputStream.readFully(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/DataInputStream#readFully(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.DataInputStream.readFully(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -886,14 +886,16 @@
         <Parameter Name="in" Type="Java.IO.IDataInput" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
-        <summary>See the general contract of the &lt;code&gt;readUTF&lt;/code&gt;
-            method of &lt;code&gt;DataInput&lt;/code&gt;.</summary>
+        <param name="in">a data input stream.</param>
+        <summary>Reads from the
+            stream &lt;code&gt;in&lt;/code&gt; a representation
+            of a Unicode  character string encoded in
+            &lt;a href="DataInput.</summary>
         <returns>a Unicode string.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/DataInputStream#readUTF()" title="Reference documentation">Java documentation for <code>java.io.DataInputStream.readUTF()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/DataInputStream#readUTF(java.io.DataInput)" title="Reference documentation">Java documentation for <code>java.io.DataInputStream.readUTF(java.io.DataInput)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/EOFException.xml b/docs/Mono.Android/en/Java.IO/EOFException.xml
index a77b181488..fb09ffb1d1 100644
--- a/docs/Mono.Android/en/Java.IO/EOFException.xml
+++ b/docs/Mono.Android/en/Java.IO/EOFException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;EOFException&lt;/code&gt; with &lt;code&gt;null&lt;/code&gt;
-            as its error detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;EOFException&lt;/code&gt; with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/EOFException#EOFException()" title="Reference documentation">Java documentation for <code>java.io.EOFException.EOFException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/EOFException#EOFException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.EOFException.EOFException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/File.xml b/docs/Mono.Android/en/Java.IO/File.xml
index 702b24e60d..afc1c9561b 100644
--- a/docs/Mono.Android/en/Java.IO/File.xml
+++ b/docs/Mono.Android/en/Java.IO/File.xml
@@ -70,15 +70,15 @@
         <Parameter Name="uri" Type="Java.Net.URI" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="parent">The parent abstract pathname</param>
-        <param name="child">The child pathname string</param>
-        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance from a parent abstract
-            pathname and a child pathname string.</summary>
+        <param name="uri">An absolute, hierarchical URI with a scheme equal to
+                    <c>"file"</c>, a non-empty path component, and undefined
+                    authority, query, and fragment components</param>
+        <summary>Creates a new <c>File</c> instance by converting the given
+            <c>file:</c> URI into an abstract pathname.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#File(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.File.File(java.io.File, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#File(java.net.URI)" title="Reference documentation">Java documentation for <code>java.io.File.File(java.net.URI)</code>.</a>
             </format>
           </para>
           <para>
@@ -114,15 +114,13 @@
         <Parameter Name="pathname" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pathname">To be added.</param>
-        <param name="parent">The parent abstract pathname</param>
-        <param name="child">The child pathname string</param>
-        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance from a parent abstract
-            pathname and a child pathname string.</summary>
+        <param name="pathname">A pathname string</param>
+        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance by converting the given
+            pathname string into an abstract pathname.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#File(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.File.File(java.io.File, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#File(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.File.File(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -222,14 +220,14 @@
         <Parameter Name="child" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parent">The parent abstract pathname</param>
+        <param name="parent">The parent pathname string</param>
         <param name="child">The child pathname string</param>
-        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance from a parent abstract
-            pathname and a child pathname string.</summary>
+        <summary>Creates a new &lt;code&gt;File&lt;/code&gt; instance from a parent pathname string
+            and a child pathname string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#File(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.File.File(java.io.File, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#File(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.File.File(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -686,23 +684,21 @@
         <Parameter Name="directory" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="directory">the location to which the temp file is to be written, or
-            <c>null</c> for the default location for temporary files,
-            which is taken from the "java.io.tmpdir" system property. It
-            may be necessary to set this property to an existing, writable
-            directory for this method to work properly.</param>
         <param name="prefix">The prefix string to be used in generating the file's
                                name; must be at least three characters long</param>
         <param name="suffix">The suffix string to be used in generating the file's
                                name; may be &lt;code&gt;null&lt;/code&gt;, in which case the
                                suffix &lt;code&gt;".tmp"&lt;/code&gt; will be used</param>
-        <summary>Creates an empty file in the default temporary-file directory, using
-            the given prefix and suffix to generate its name.</summary>
+        <param name="directory">The directory in which the file is to be created, or
+                               &lt;code&gt;null&lt;/code&gt; if the default temporary-file
+                               directory is to be used</param>
+        <summary>Creates a new empty file in the specified directory, using the
+            given prefix and suffix strings to generate its name.</summary>
         <returns>An abstract pathname denoting a newly-created empty file</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#createTempFile(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.File.createTempFile(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)" title="Reference documentation">Java documentation for <code>java.io.File.createTempFile(java.lang.String, java.lang.String, java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -1245,18 +1241,20 @@
         <Parameter Name="filter" Type="Java.IO.IFilenameFilter" />
       </Parameters>
       <Docs>
-        <param name="filter">the filter to match names against, may be <c>null</c>.</param>
+        <param name="filter">A filename filter</param>
         <summary>Returns an array of strings naming the files and directories in the
-            directory denoted by this abstract pathname.</summary>
+            directory denoted by this abstract pathname that satisfy the specified
+            filter.</summary>
         <returns>An array of strings naming the files and directories in the
-                     directory denoted by this abstract pathname.  The array will be
-                     empty if the directory is empty.  Returns <c>null</c> if
-                     this abstract pathname does not denote a directory, or if an
-                     I/O error occurs.</returns>
+                     directory denoted by this abstract pathname that were accepted
+                     by the given <c>filter</c>.  The array will be empty if the
+                     directory is empty or if no names were accepted by the filter.
+                     Returns <c>null</c> if this abstract pathname does not denote
+                     a directory, or if an I/O error occurs.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#list()" title="Reference documentation">Java documentation for <code>java.io.File.list()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#list(java.io.FilenameFilter)" title="Reference documentation">Java documentation for <code>java.io.File.list(java.io.FilenameFilter)</code>.</a>
             </format>
           </para>
           <para>
@@ -1381,9 +1379,10 @@
         <Parameter Name="filter" Type="Java.IO.IFileFilter" />
       </Parameters>
       <Docs>
-        <param name="filter">the filter to match names against, may be <c>null</c>.</param>
-        <summary>Returns an array of abstract pathnames denoting the files in the
-            directory denoted by this abstract pathname.</summary>
+        <param name="filter">A file filter</param>
+        <summary>Returns an array of abstract pathnames denoting the files and
+            directories in the directory denoted by this abstract pathname that
+            satisfy the specified filter.</summary>
         <returns>An array of abstract pathnames denoting the files and
                      directories in the directory denoted by this abstract pathname.
                      The array will be empty if the directory is empty.  Returns
@@ -1392,7 +1391,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#listFiles()" title="Reference documentation">Java documentation for <code>java.io.File.listFiles()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#listFiles(java.io.FileFilter)" title="Reference documentation">Java documentation for <code>java.io.File.listFiles(java.io.FileFilter)</code>.</a>
             </format>
           </para>
           <para>
@@ -1427,9 +1426,10 @@
         <Parameter Name="filter" Type="Java.IO.IFilenameFilter" />
       </Parameters>
       <Docs>
-        <param name="filter">the filter to match names against, may be <c>null</c>.</param>
-        <summary>Returns an array of abstract pathnames denoting the files in the
-            directory denoted by this abstract pathname.</summary>
+        <param name="filter">A filename filter</param>
+        <summary>Returns an array of abstract pathnames denoting the files and
+            directories in the directory denoted by this abstract pathname that
+            satisfy the specified filter.</summary>
         <returns>An array of abstract pathnames denoting the files and
                      directories in the directory denoted by this abstract pathname.
                      The array will be empty if the directory is empty.  Returns
@@ -1438,7 +1438,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#listFiles()" title="Reference documentation">Java documentation for <code>java.io.File.listFiles()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#listFiles(java.io.FilenameFilter)" title="Reference documentation">Java documentation for <code>java.io.File.listFiles(java.io.FilenameFilter)</code>.</a>
             </format>
           </para>
           <para>
@@ -2085,24 +2085,25 @@
         <Parameter Name="ownerOnly" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="ownerOnly">To manipulate execute permission only for owner if true,
-            otherwise for everyone. The manipulation will apply to
-            everyone regardless of this value if the underlying system
-            does not distinguish owner and other users.</param>
         <param name="executable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow execute
                      operations; if &lt;code&gt;false&lt;/code&gt; to disallow execute operations</param>
-        <summary>A convenience method to set the owner's execute permission for this
-            abstract pathname.</summary>
+        <param name="ownerOnly">If &lt;code&gt;true&lt;/code&gt;, the execute permission applies only to the
+                     owner's execute permission; otherwise, it applies to everybody.
+                     If the underlying file system can not distinguish the owner's
+                     execute permission from that of others, then the permission will
+                     apply to everybody, regardless of this value.</param>
+        <summary>Sets the owner's or everybody's execute permission for this abstract
+            pathname.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
-                      operation will fail if the user does not have permission to
-                      change the access permissions of this abstract pathname.  If
-                      &lt;code&gt;executable&lt;/code&gt; is &lt;code&gt;false&lt;/code&gt; and the underlying
-                      file system does not implement an execute permission, then the
-                      operation will fail.</returns>
+                     operation will fail if the user does not have permission to
+                     change the access permissions of this abstract pathname.  If
+                     &lt;code&gt;executable&lt;/code&gt; is &lt;code&gt;false&lt;/code&gt; and the underlying
+                     file system does not implement an execute permission, then the
+                     operation will fail.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#setExecutable(boolean)" title="Reference documentation">Java documentation for <code>java.io.File.setExecutable(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#setExecutable(boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.File.setExecutable(boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -2233,13 +2234,14 @@
         <Parameter Name="ownerOnly" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="ownerOnly">To manipulate read permission only for owner if true,
-            otherwise for everyone. The manipulation will apply to
-            everyone regardless of this value if the underlying system
-            does not distinguish owner and other users.</param>
         <param name="readable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow read
                      operations; if &lt;code&gt;false&lt;/code&gt; to disallow read operations</param>
-        <summary>A convenience method to set the owner's read permission for this abstract
+        <param name="ownerOnly">If &lt;code&gt;true&lt;/code&gt;, the read permission applies only to the
+                     owner's read permission; otherwise, it applies to everybody.  If
+                     the underlying file system can not distinguish the owner's read
+                     permission from that of others, then the permission will apply to
+                     everybody, regardless of this value.</param>
+        <summary>Sets the owner's or everybody's read permission for this abstract
             pathname.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
                      operation will fail if the user does not have permission to
@@ -2250,7 +2252,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#setReadable(boolean)" title="Reference documentation">Java documentation for <code>java.io.File.setReadable(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#setReadable(boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.File.setReadable(boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -2373,21 +2375,22 @@
         <Parameter Name="ownerOnly" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="ownerOnly">To manipulate write permission only for owner if true,
-            otherwise for everyone. The manipulation will apply to
-            everyone regardless of this value if the underlying system
-            does not distinguish owner and other users.</param>
         <param name="writable">If &lt;code&gt;true&lt;/code&gt;, sets the access permission to allow write
                      operations; if &lt;code&gt;false&lt;/code&gt; to disallow write operations</param>
-        <summary>A convenience method to set the owner's write permission for this abstract
+        <param name="ownerOnly">If &lt;code&gt;true&lt;/code&gt;, the write permission applies only to the
+                     owner's write permission; otherwise, it applies to everybody.  If
+                     the underlying file system can not distinguish the owner's write
+                     permission from that of others, then the permission will apply to
+                     everybody, regardless of this value.</param>
+        <summary>Sets the owner's or everybody's write permission for this abstract
             pathname.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded.  The
-                     operation will fail if the user does not have permission to
-                     change the access permissions of this abstract pathname.</returns>
+        <returns>&lt;code&gt;true&lt;/code&gt; if and only if the operation succeeded. The
+                     operation will fail if the user does not have permission to change
+                     the access permissions of this abstract pathname.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/File#setWritable(boolean)" title="Reference documentation">Java documentation for <code>java.io.File.setWritable(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/File#setWritable(boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.File.setWritable(boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileInputStream.xml b/docs/Mono.Android/en/Java.IO/FileInputStream.xml
index ecda146576..ee5ea6fd39 100644
--- a/docs/Mono.Android/en/Java.IO/FileInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/FileInputStream.xml
@@ -110,16 +110,14 @@
         <Parameter Name="fdObj" Type="Java.IO.FileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="fdObj">To be added.</param>
-        <param name="file">the file to be opened for reading.</param>
-        <summary>Creates a &lt;code&gt;FileInputStream&lt;/code&gt; by
-            opening a connection to an actual file,
-            the file named by the &lt;code&gt;File&lt;/code&gt;
-            object &lt;code&gt;file&lt;/code&gt; in the file system.</summary>
+        <param name="fdObj">the file descriptor to be opened for reading.</param>
+        <summary>Creates a &lt;code&gt;FileInputStream&lt;/code&gt; by using the file descriptor
+            &lt;code&gt;fdObj&lt;/code&gt;, which represents an existing connection to an
+            actual file in the file system.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileInputStream#FileInputStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileInputStream.FileInputStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileInputStream#FileInputStream(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>java.io.FileInputStream.FileInputStream(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,16 +151,15 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="file">the file to be opened for reading.</param>
+        <param name="name">the system-dependent file name.</param>
         <summary>Creates a &lt;code&gt;FileInputStream&lt;/code&gt; by
             opening a connection to an actual file,
-            the file named by the &lt;code&gt;File&lt;/code&gt;
-            object &lt;code&gt;file&lt;/code&gt; in the file system.</summary>
+            the file named by the path name &lt;code&gt;name&lt;/code&gt;
+            in the file system.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileInputStream#FileInputStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileInputStream.FileInputStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileInputStream#FileInputStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.FileInputStream.FileInputStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml b/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml
index 3061a8923b..50b0acc5a6 100644
--- a/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml
+++ b/docs/Mono.Android/en/Java.IO/FileNotFoundException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;FileNotFoundException&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its error detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;FileNotFoundException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileNotFoundException#FileNotFoundException()" title="Reference documentation">Java documentation for <code>java.io.FileNotFoundException.FileNotFoundException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileNotFoundException#FileNotFoundException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.FileNotFoundException.FileNotFoundException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileOutputStream.xml b/docs/Mono.Android/en/Java.IO/FileOutputStream.xml
index 33e04c0360..8dcf20eb76 100644
--- a/docs/Mono.Android/en/Java.IO/FileOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/FileOutputStream.xml
@@ -108,14 +108,14 @@
         <Parameter Name="fdObj" Type="Java.IO.FileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="fdObj">To be added.</param>
-        <param name="file">the file to be opened for writing.</param>
-        <summary>Creates a file output stream to write to the file represented by
-            the specified &lt;code&gt;File&lt;/code&gt; object.</summary>
+        <param name="fdObj">the file descriptor to be opened for writing</param>
+        <summary>Creates a file output stream to write to the specified file
+            descriptor, which represents an existing connection to an actual
+            file in the file system.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -149,14 +149,13 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="file">the file to be opened for writing.</param>
-        <summary>Creates a file output stream to write to the file represented by
-            the specified &lt;code&gt;File&lt;/code&gt; object.</summary>
+        <param name="name">the system-dependent filename</param>
+        <summary>Creates a file output stream to write to the file with the
+            specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -191,14 +190,15 @@
         <Parameter Name="append" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="append">To be added.</param>
         <param name="file">the file to be opened for writing.</param>
+        <param name="append">if &lt;code&gt;true&lt;/code&gt;, then bytes will be written
+                              to the end of the file rather than the beginning</param>
         <summary>Creates a file output stream to write to the file represented by
             the specified &lt;code&gt;File&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.io.File,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.io.File, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -256,15 +256,15 @@
         <Parameter Name="append" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="append">To be added.</param>
-        <param name="file">the file to be opened for writing.</param>
-        <summary>Creates a file output stream to write to the file represented by
-            the specified &lt;code&gt;File&lt;/code&gt; object.</summary>
+        <param name="name">the system-dependent file name</param>
+        <param name="append">if &lt;code&gt;true&lt;/code&gt;, then bytes will be written
+                              to the end of the file rather than the beginning</param>
+        <summary>Creates a file output stream to write to the file with the specified
+            name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileOutputStream#FileOutputStream(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.FileOutputStream.FileOutputStream(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileReader.xml b/docs/Mono.Android/en/Java.IO/FileReader.xml
index 394d8e4bc8..1febfc8374 100644
--- a/docs/Mono.Android/en/Java.IO/FileReader.xml
+++ b/docs/Mono.Android/en/Java.IO/FileReader.xml
@@ -94,14 +94,13 @@
         <Parameter Name="fd" Type="Java.IO.FileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="fd">To be added.</param>
-        <param name="file">the <c>File</c> to read from</param>
-        <summary>Creates a new <c>FileReader</c>, given the <c>File</c>
-            to read from.</summary>
+        <param name="fd">the FileDescriptor to read from</param>
+        <summary>Creates a new <c>FileReader</c>, given the
+            <c>FileDescriptor</c> to read from.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileReader#FileReader(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileReader.FileReader(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileReader#FileReader(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>java.io.FileReader.FileReader(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -133,14 +132,13 @@
         <Parameter Name="fileName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="file">the <c>File</c> to read from</param>
-        <summary>Creates a new <c>FileReader</c>, given the <c>File</c>
-            to read from.</summary>
+        <param name="fileName">the name of the file to read from</param>
+        <summary>Creates a new <c>FileReader</c>, given the name of the
+            file to read from.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileReader#FileReader(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileReader.FileReader(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileReader#FileReader(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.FileReader.FileReader(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FileWriter.xml b/docs/Mono.Android/en/Java.IO/FileWriter.xml
index cc94709c7e..675fa7ff40 100644
--- a/docs/Mono.Android/en/Java.IO/FileWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/FileWriter.xml
@@ -93,13 +93,12 @@
         <Parameter Name="fd" Type="Java.IO.FileDescriptor" />
       </Parameters>
       <Docs>
-        <param name="fd">To be added.</param>
-        <param name="file">a File object to write to.</param>
-        <summary>Constructs a FileWriter object given a File object.</summary>
+        <param name="fd">FileDescriptor object to write to.</param>
+        <summary>Constructs a FileWriter object associated with a file descriptor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.io.FileDescriptor)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.io.FileDescriptor)</code>.</a>
             </format>
           </para>
           <para>
@@ -131,13 +130,12 @@
         <Parameter Name="fileName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="file">a File object to write to.</param>
-        <summary>Constructs a FileWriter object given a File object.</summary>
+        <param name="fileName">String The system-dependent filename.</param>
+        <summary>Constructs a FileWriter object given a file name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -172,13 +170,14 @@
         <Parameter Name="append" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="append">To be added.</param>
-        <param name="file">a File object to write to.</param>
+        <param name="file">a File object to write to</param>
+        <param name="append">if &lt;code&gt;true&lt;/code&gt;, then bytes will be written
+                                 to the end of the file rather than the beginning</param>
         <summary>Constructs a FileWriter object given a File object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.io.File,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.io.File, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -236,14 +235,15 @@
         <Parameter Name="append" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="append">To be added.</param>
-        <param name="file">a File object to write to.</param>
-        <summary>Constructs a FileWriter object given a File object.</summary>
+        <param name="fileName">String The system-dependent filename.</param>
+        <param name="append">boolean if &lt;code&gt;true&lt;/code&gt;, then data will be written
+                             to the end of the file rather than the beginning.</param>
+        <summary>Constructs a FileWriter object given a file name with a boolean
+            indicating whether or not to append the data written.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FileWriter#FileWriter(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.FileWriter.FileWriter(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FilterReader.xml b/docs/Mono.Android/en/Java.IO/FilterReader.xml
index d6f2fc2836..1a317c7b78 100644
--- a/docs/Mono.Android/en/Java.IO/FilterReader.xml
+++ b/docs/Mono.Android/en/Java.IO/FilterReader.xml
@@ -220,12 +220,12 @@
         <param name="cbuf">To be added.</param>
         <param name="off">To be added.</param>
         <param name="len">To be added.</param>
-        <summary>Reads a single character.</summary>
+        <summary>Reads characters into a portion of an array.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FilterReader#read()" title="Reference documentation">Java documentation for <code>java.io.FilterReader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FilterReader#read(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.FilterReader.read(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/FilterWriter.xml b/docs/Mono.Android/en/Java.IO/FilterWriter.xml
index 974a268f2f..fa06e1ecf1 100644
--- a/docs/Mono.Android/en/Java.IO/FilterWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/FilterWriter.xml
@@ -318,14 +318,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Writes a single character.</summary>
+        <param name="cbuf">Buffer of characters to be written</param>
+        <param name="off">Offset from which to start reading characters</param>
+        <param name="len">Number of characters to be written</param>
+        <summary>Writes a portion of an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/FilterWriter#write(int)" title="Reference documentation">Java documentation for <code>java.io.FilterWriter.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/FilterWriter#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.FilterWriter.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/IDataInput.xml b/docs/Mono.Android/en/Java.IO/IDataInput.xml
index 9cda0b65cb..a3e36b4d91 100644
--- a/docs/Mono.Android/en/Java.IO/IDataInput.xml
+++ b/docs/Mono.Android/en/Java.IO/IDataInput.xml
@@ -326,16 +326,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the buffer into which the data is read.</param>
-        <summary>Reads some bytes from an input
-            stream and stores them into the buffer
-            array <c>b</c>.</summary>
+        <param name="off">an int specifying the offset into the data.</param>
+        <param name="len">an int specifying the number of bytes to read.</param>
+        <summary>Reads <c>len</c>
+            bytes from
+            an input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/DataInput#readFully(byte[])" title="Reference documentation">Java documentation for <code>java.io.DataInput.readFully(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/DataInput#readFully(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.DataInput.readFully(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/IDataOutput.xml b/docs/Mono.Android/en/Java.IO/IDataOutput.xml
index 9f8549ef2b..19713ce7c7 100644
--- a/docs/Mono.Android/en/Java.IO/IDataOutput.xml
+++ b/docs/Mono.Android/en/Java.IO/IDataOutput.xml
@@ -67,13 +67,12 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">the byte to be written.</param>
-        <summary>Writes to the output stream the eight
-            low-order bits of the argument &lt;code&gt;b&lt;/code&gt;.</summary>
+        <param name="b">the data.</param>
+        <summary>Writes to the output stream all the bytes in array &lt;code&gt;b&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/DataOutput#write(int)" title="Reference documentation">Java documentation for <code>java.io.DataOutput.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/DataOutput#write(byte[])" title="Reference documentation">Java documentation for <code>java.io.DataOutput.write(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -155,15 +154,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="b">the byte to be written.</param>
-        <summary>Writes to the output stream the eight
-            low-order bits of the argument &lt;code&gt;b&lt;/code&gt;.</summary>
+        <param name="b">the data.</param>
+        <param name="off">the start offset in the data.</param>
+        <param name="len">the number of bytes to write.</param>
+        <summary>Writes &lt;code&gt;len&lt;/code&gt; bytes from array
+            &lt;code&gt;b&lt;/code&gt;, in order,  to
+            the output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/DataOutput#write(int)" title="Reference documentation">Java documentation for <code>java.io.DataOutput.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/DataOutput#write(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.DataOutput.write(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/IOException.xml b/docs/Mono.Android/en/Java.IO/IOException.xml
index c73815557b..a77662cd13 100644
--- a/docs/Mono.Android/en/Java.IO/IOException.xml
+++ b/docs/Mono.Android/en/Java.IO/IOException.xml
@@ -88,13 +88,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an <c>IOException</c> with <c>null</c>
-            as its error detail message.</summary>
+        <param name="cause">The cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A null value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Constructs an <c>IOException</c> with the specified cause and a
+            detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/IOException#IOException()" title="Reference documentation">Java documentation for <code>java.io.IOException.IOException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/IOException#IOException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.io.IOException.IOException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +129,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs an <c>IOException</c> with <c>null</c>
-            as its error detail message.</summary>
+        <param name="message">The detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method)</param>
+        <summary>Constructs an <c>IOException</c> with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/IOException#IOException()" title="Reference documentation">Java documentation for <code>java.io.IOException.IOException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/IOException#IOException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.IOException.IOException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,14 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an <c>IOException</c> with <c>null</c>
-            as its error detail message.</summary>
+        <param name="message">The detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method)</param>
+        <param name="cause">The cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A null value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Constructs an <c>IOException</c> with the specified detail message
+            and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/IOException#IOException()" title="Reference documentation">Java documentation for <code>java.io.IOException.IOException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/IOException#IOException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.io.IOException.IOException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/IObjectInput.xml b/docs/Mono.Android/en/Java.IO/IObjectInput.xml
index 4e8e62d3a8..ce9d4776b3 100644
--- a/docs/Mono.Android/en/Java.IO/IObjectInput.xml
+++ b/docs/Mono.Android/en/Java.IO/IObjectInput.xml
@@ -189,14 +189,14 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Reads a byte of data.</summary>
-        <returns>the byte read, or -1 if the end of the
-                     stream is reached.</returns>
+        <param name="b">the buffer into which the data is read</param>
+        <summary>Reads into an array of bytes.</summary>
+        <returns>the actual number of bytes read, -1 is
+                     returned when the end of the stream is reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ObjectInput#read()" title="Reference documentation">Java documentation for <code>java.io.ObjectInput.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ObjectInput#read(byte[])" title="Reference documentation">Java documentation for <code>java.io.ObjectInput.read(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -235,16 +235,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Reads a byte of data.</summary>
-        <returns>the byte read, or -1 if the end of the
-                     stream is reached.</returns>
+        <param name="b">the buffer into which the data is read</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the maximum number of bytes read</param>
+        <summary>Reads into an array of bytes.</summary>
+        <returns>the actual number of bytes read, -1 is
+                     returned when the end of the stream is reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ObjectInput#read()" title="Reference documentation">Java documentation for <code>java.io.ObjectInput.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ObjectInput#read(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.ObjectInput.read(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/InputStream.xml b/docs/Mono.Android/en/Java.IO/InputStream.xml
index 9d2ae7663c..9c66d66c27 100644
--- a/docs/Mono.Android/en/Java.IO/InputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/InputStream.xml
@@ -365,14 +365,16 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Reads the next byte of data from the input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
-                        stream is reached.</returns>
+        <param name="b">the buffer into which the data is read.</param>
+        <summary>Reads some number of bytes from the input stream and stores them into
+            the buffer array &lt;code&gt;b&lt;/code&gt;.</summary>
+        <returns>the total number of bytes read into the buffer, or
+                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end of
+                        the stream has been reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InputStream#read()" title="Reference documentation">Java documentation for <code>java.io.InputStream.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InputStream#read(byte[])" title="Reference documentation">Java documentation for <code>java.io.InputStream.read(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -410,16 +412,19 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Reads the next byte of data from the input stream.</summary>
-        <returns>the next byte of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
-                        stream is reached.</returns>
+        <param name="b">the buffer into which the data is read.</param>
+        <param name="off">the start offset in array &lt;code&gt;b&lt;/code&gt;
+                              at which the data is written.</param>
+        <param name="len">the maximum number of bytes to read.</param>
+        <summary>Reads up to &lt;code&gt;len&lt;/code&gt; bytes of data from the input stream into
+            an array of bytes.</summary>
+        <returns>the total number of bytes read into the buffer, or
+                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end of
+                        the stream has been reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InputStream#read()" title="Reference documentation">Java documentation for <code>java.io.InputStream.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InputStream#read(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.InputStream.read(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/InputStreamReader.xml b/docs/Mono.Android/en/Java.IO/InputStreamReader.xml
index b294ab112e..185a84c7dc 100644
--- a/docs/Mono.Android/en/Java.IO/InputStreamReader.xml
+++ b/docs/Mono.Android/en/Java.IO/InputStreamReader.xml
@@ -116,13 +116,13 @@
         <Parameter Name="cs" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="cs">To be added.</param>
         <param name="in">An InputStream</param>
-        <summary>Creates an InputStreamReader that uses the default charset.</summary>
+        <param name="cs">A charset</param>
+        <summary>Creates an InputStreamReader that uses the given charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InputStreamReader#InputStreamReader(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.InputStreamReader(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InputStreamReader#InputStreamReader(java.io.InputStream,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.InputStreamReader(java.io.InputStream, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,13 +155,13 @@
         <Parameter Name="dec" Type="Java.Nio.Charset.CharsetDecoder" />
       </Parameters>
       <Docs>
-        <param name="dec">To be added.</param>
         <param name="in">An InputStream</param>
-        <summary>Creates an InputStreamReader that uses the default charset.</summary>
+        <param name="dec">A charset decoder</param>
+        <summary>Creates an InputStreamReader that uses the given charset decoder.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InputStreamReader#InputStreamReader(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.InputStreamReader(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InputStreamReader#InputStreamReader(java.io.InputStream,%20java.nio.charset.CharsetDecoder)" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.InputStreamReader(java.io.InputStream, java.nio.charset.CharsetDecoder)</code>.</a>
             </format>
           </para>
           <para>
@@ -194,13 +194,14 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">To be added.</param>
         <param name="in">An InputStream</param>
-        <summary>Creates an InputStreamReader that uses the default charset.</summary>
+        <param name="charsetName">The name of a supported
+                    <c>java.nio.charset.Charset charset</c></param>
+        <summary>Creates an InputStreamReader that uses the named charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InputStreamReader#InputStreamReader(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.InputStreamReader(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InputStreamReader#InputStreamReader(java.io.InputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.InputStreamReader(java.io.InputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -339,17 +340,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="offset">the initial position in <c>buf</c> to store the characters
-            read from this reader.</param>
-        <param name="length">the maximum number of characters to read.</param>
-        <summary>Reads a single character.</summary>
-        <returns>The character read, or -1 if the end of the stream has been
-                    reached</returns>
+        <param name="cbuf">Destination buffer</param>
+        <param name="offset">Offset at which to start storing characters</param>
+        <param name="length">Maximum number of characters to read</param>
+        <summary>Reads characters into a portion of an array.</summary>
+        <returns>The number of characters read, or -1 if the end of the
+                        stream has been reached</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InputStreamReader#read()" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InputStreamReader#read(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.InputStreamReader.read(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml b/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml
index 8addf2963e..57bec2caaf 100644
--- a/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml
+++ b/docs/Mono.Android/en/Java.IO/InterruptedIOException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;InterruptedIOException&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its error detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;InterruptedIOException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InterruptedIOException#InterruptedIOException()" title="Reference documentation">Java documentation for <code>java.io.InterruptedIOException.InterruptedIOException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InterruptedIOException#InterruptedIOException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.InterruptedIOException.InterruptedIOException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/InvalidClassException.xml b/docs/Mono.Android/en/Java.IO/InvalidClassException.xml
index f552ced859..07b64686bb 100644
--- a/docs/Mono.Android/en/Java.IO/InvalidClassException.xml
+++ b/docs/Mono.Android/en/Java.IO/InvalidClassException.xml
@@ -116,13 +116,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="cname">To be added.</param>
-        <param name="reason">String describing the reason for the exception.</param>
-        <summary>Report an InvalidClassException for the reason specified.</summary>
+        <param name="cname">a String naming the invalid class.</param>
+        <param name="reason">a String describing the reason for the exception.</param>
+        <summary>Constructs an InvalidClassException object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/InvalidClassException#InvalidClassException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.InvalidClassException.InvalidClassException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/InvalidClassException#InvalidClassException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.InvalidClassException.InvalidClassException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/LineNumberReader.xml b/docs/Mono.Android/en/Java.IO/LineNumberReader.xml
index 19bdced7eb..f1f0b595a0 100644
--- a/docs/Mono.Android/en/Java.IO/LineNumberReader.xml
+++ b/docs/Mono.Android/en/Java.IO/LineNumberReader.xml
@@ -93,14 +93,14 @@
         <Parameter Name="sz" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sz">To be added.</param>
         <param name="in">A Reader object to provide the underlying stream</param>
-        <summary>Create a new line-numbering reader, using the default input-buffer
-            size.</summary>
+        <param name="sz">An int specifying the size of the buffer</param>
+        <summary>Create a new line-numbering reader, reading characters into a buffer of
+            the given size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/LineNumberReader#LineNumberReader(java.io.Reader)" title="Reference documentation">Java documentation for <code>java.io.LineNumberReader.LineNumberReader(java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/LineNumberReader#LineNumberReader(java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>java.io.LineNumberReader.LineNumberReader(java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/NotActiveException.xml b/docs/Mono.Android/en/Java.IO/NotActiveException.xml
index 86ddca5437..590e288947 100644
--- a/docs/Mono.Android/en/Java.IO/NotActiveException.xml
+++ b/docs/Mono.Android/en/Java.IO/NotActiveException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructor to create a new NotActiveException without a reason.</summary>
+        <param name="reason">a String describing the reason for the exception.</param>
+        <summary>Constructor to create a new NotActiveException with the reason given.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/NotActiveException#NotActiveException()" title="Reference documentation">Java documentation for <code>java.io.NotActiveException.NotActiveException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/NotActiveException#NotActiveException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.NotActiveException.NotActiveException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/NotSerializableException.xml b/docs/Mono.Android/en/Java.IO/NotSerializableException.xml
index 42c354667d..3c72b0aaa3 100644
--- a/docs/Mono.Android/en/Java.IO/NotSerializableException.xml
+++ b/docs/Mono.Android/en/Java.IO/NotSerializableException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="classname" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="classname">To be added.</param>
-        <summary>Constructs a NotSerializableException object.</summary>
+        <param name="classname">Class of the instance being serialized/deserialized.</param>
+        <summary>Constructs a NotSerializableException object with message string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/NotSerializableException#NotSerializableException()" title="Reference documentation">Java documentation for <code>java.io.NotSerializableException.NotSerializableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/NotSerializableException#NotSerializableException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.NotSerializableException.NotSerializableException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml b/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml
index 0ce0603101..47eda4e79a 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectInputStream.xml
@@ -108,14 +108,12 @@
         <Parameter Name="in" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
-        <summary>Provide a way for subclasses that are completely reimplementing
-            ObjectInputStream to not have to allocate private data just used by this
-            implementation of ObjectInputStream.</summary>
+        <param name="in">input stream to read from</param>
+        <summary>Creates an ObjectInputStream that reads from the specified InputStream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ObjectInputStream#ObjectInputStream()" title="Reference documentation">Java documentation for <code>java.io.ObjectInputStream.ObjectInputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ObjectInputStream#ObjectInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.ObjectInputStream.ObjectInputStream(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -703,14 +701,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="buf">the buffer into which the data is read</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the maximum number of bytes to read</param>
         <summary>Reads bytes, blocking until all bytes are read.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ObjectInputStream#readFully(byte[])" title="Reference documentation">Java documentation for <code>java.io.ObjectInputStream.readFully(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ObjectInputStream#readFully(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.ObjectInputStream.readFully(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ObjectOutputStream.xml b/docs/Mono.Android/en/Java.IO/ObjectOutputStream.xml
index d6764532b1..4e1485f125 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectOutputStream.xml
@@ -108,14 +108,12 @@
         <Parameter Name="out" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <summary>Provide a way for subclasses that are completely reimplementing
-            ObjectOutputStream to not have to allocate private data just used by
-            this implementation of ObjectOutputStream.</summary>
+        <param name="out">output stream to write to</param>
+        <summary>Creates an ObjectOutputStream that writes to the specified OutputStream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ObjectOutputStream#ObjectOutputStream()" title="Reference documentation">Java documentation for <code>java.io.ObjectOutputStream.ObjectOutputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ObjectOutputStream#ObjectOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.io.ObjectOutputStream.ObjectOutputStream(java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ObjectStreamException.xml b/docs/Mono.Android/en/Java.IO/ObjectStreamException.xml
index 57514bc524..7ea5ae566e 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectStreamException.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectStreamException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="classname" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="classname">To be added.</param>
-        <summary>Create an ObjectStreamException.</summary>
+        <param name="classname">the detailed message for the exception</param>
+        <summary>Create an ObjectStreamException with the specified argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ObjectStreamException#ObjectStreamException()" title="Reference documentation">Java documentation for <code>java.io.ObjectStreamException.ObjectStreamException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ObjectStreamException#ObjectStreamException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.ObjectStreamException.ObjectStreamException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml b/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml
index c88515b6de..cc3fa5c911 100644
--- a/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml
+++ b/docs/Mono.Android/en/Java.IO/ObjectStreamField.xml
@@ -130,14 +130,17 @@
         <Parameter Name="unshared" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="unshared">To be added.</param>
-        <param name="name">the name of the serializable field</param>
-        <param name="type">the &lt;code&gt;Class&lt;/code&gt; object of the serializable field</param>
-        <summary>Create a Serializable field with the specified type.</summary>
+        <param name="name">field name</param>
+        <param name="type">field type</param>
+        <param name="unshared">if false, write/read field values in the same manner
+                     as writeObject/readObject; if true, write/read in the same
+                     manner as writeUnshared/readUnshared</param>
+        <summary>Creates an ObjectStreamField representing a serializable field with the
+            given name and type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/ObjectStreamField#ObjectStreamField(java.lang.String,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>java.io.ObjectStreamField.ObjectStreamField(java.lang.String, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/ObjectStreamField#ObjectStreamField(java.lang.String,%20java.lang.Class,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.ObjectStreamField.ObjectStreamField(java.lang.String, java.lang.Class, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/OutputStream.xml b/docs/Mono.Android/en/Java.IO/OutputStream.xml
index dc0f1a5f2d..b8361768a7 100644
--- a/docs/Mono.Android/en/Java.IO/OutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/OutputStream.xml
@@ -303,12 +303,12 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">the &lt;code&gt;byte&lt;/code&gt;.</param>
-        <summary>Writes the specified byte to this output stream.</summary>
+        <param name="b">the data.</param>
+        <summary>Writes &lt;code&gt;b.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/OutputStream#write(int)" title="Reference documentation">Java documentation for <code>java.io.OutputStream.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/OutputStream#write(byte[])" title="Reference documentation">Java documentation for <code>java.io.OutputStream.write(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -388,14 +388,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="b">the &lt;code&gt;byte&lt;/code&gt;.</param>
-        <summary>Writes the specified byte to this output stream.</summary>
+        <param name="b">the data.</param>
+        <param name="off">the start offset in the data.</param>
+        <param name="len">the number of bytes to write.</param>
+        <summary>Writes &lt;code&gt;len&lt;/code&gt; bytes from the specified byte array
+            starting at offset &lt;code&gt;off&lt;/code&gt; to this output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/OutputStream#write(int)" title="Reference documentation">Java documentation for <code>java.io.OutputStream.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/OutputStream#write(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.OutputStream.write(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml b/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml
index 2ef8a74974..c4d5dbfc82 100644
--- a/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/OutputStreamWriter.xml
@@ -116,13 +116,13 @@
         <Parameter Name="cs" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="cs">To be added.</param>
         <param name="out">An OutputStream</param>
-        <summary>Creates an OutputStreamWriter that uses the default character encoding.</summary>
+        <param name="cs">A charset</param>
+        <summary>Creates an OutputStreamWriter that uses the given charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#OutputStreamWriter(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.OutputStreamWriter(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#OutputStreamWriter(java.io.OutputStream,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.OutputStreamWriter(java.io.OutputStream, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,13 +155,13 @@
         <Parameter Name="enc" Type="Java.Nio.Charset.CharsetEncoder" />
       </Parameters>
       <Docs>
-        <param name="enc">To be added.</param>
         <param name="out">An OutputStream</param>
-        <summary>Creates an OutputStreamWriter that uses the default character encoding.</summary>
+        <param name="enc">A charset encoder</param>
+        <summary>Creates an OutputStreamWriter that uses the given charset encoder.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#OutputStreamWriter(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.OutputStreamWriter(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#OutputStreamWriter(java.io.OutputStream,%20java.nio.charset.CharsetEncoder)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.OutputStreamWriter(java.io.OutputStream, java.nio.charset.CharsetEncoder)</code>.</a>
             </format>
           </para>
           <para>
@@ -194,13 +194,14 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">To be added.</param>
         <param name="out">An OutputStream</param>
-        <summary>Creates an OutputStreamWriter that uses the default character encoding.</summary>
+        <param name="charsetName">The name of a supported
+                    <c>java.nio.charset.Charset charset</c></param>
+        <summary>Creates an OutputStreamWriter that uses the named charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#OutputStreamWriter(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.OutputStreamWriter(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#OutputStreamWriter(java.io.OutputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.OutputStreamWriter(java.io.OutputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -440,14 +441,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Writes a single character.</summary>
+        <param name="cbuf">Buffer of characters</param>
+        <param name="off">Offset from which to start writing characters</param>
+        <param name="len">Number of characters to write</param>
+        <summary>Writes a portion of an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#write(int)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/OutputStreamWriter#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.OutputStreamWriter.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PipedInputStream.xml b/docs/Mono.Android/en/Java.IO/PipedInputStream.xml
index 37a7efc6c6..cc887d210a 100644
--- a/docs/Mono.Android/en/Java.IO/PipedInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedInputStream.xml
@@ -91,13 +91,14 @@
         <Parameter Name="src" Type="Java.IO.PipedOutputStream" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
+        <param name="src">the stream to connect to.</param>
         <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so
-            that it is not yet #connect(java.</summary>
+            that it is connected to the piped output
+            stream &lt;code&gt;src&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedInputStream#PipedInputStream()" title="Reference documentation">Java documentation for <code>java.io.PipedInputStream.PipedInputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedInputStream#PipedInputStream(java.io.PipedOutputStream)" title="Reference documentation">Java documentation for <code>java.io.PipedInputStream.PipedInputStream(java.io.PipedOutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -131,13 +132,13 @@
         <Parameter Name="pipeSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pipeSize">To be added.</param>
-        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so
-            that it is not yet #connect(java.</summary>
+        <param name="pipeSize">the size of the pipe's buffer.</param>
+        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so that it is not yet
+            #connect(java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedInputStream#PipedInputStream()" title="Reference documentation">Java documentation for <code>java.io.PipedInputStream.PipedInputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedInputStream#PipedInputStream(int)" title="Reference documentation">Java documentation for <code>java.io.PipedInputStream.PipedInputStream(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -171,14 +172,16 @@
         <Parameter Name="pipeSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="pipeSize">To be added.</param>
-        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so
-            that it is not yet #connect(java.</summary>
+        <param name="src">the stream to connect to.</param>
+        <param name="pipeSize">the size of the pipe's buffer.</param>
+        <summary>Creates a &lt;code&gt;PipedInputStream&lt;/code&gt; so that it is
+            connected to the piped output stream
+            &lt;code&gt;src&lt;/code&gt; and uses the specified pipe size for
+            the pipe's buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedInputStream#PipedInputStream()" title="Reference documentation">Java documentation for <code>java.io.PipedInputStream.PipedInputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedInputStream#PipedInputStream(java.io.PipedOutputStream,%20int)" title="Reference documentation">Java documentation for <code>java.io.PipedInputStream.PipedInputStream(java.io.PipedOutputStream, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml b/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml
index cb58dd8f81..6ddc568cd5 100644
--- a/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedOutputStream.xml
@@ -89,13 +89,13 @@
         <Parameter Name="snk" Type="Java.IO.PipedInputStream" />
       </Parameters>
       <Docs>
-        <param name="snk">To be added.</param>
-        <summary>Creates a piped output stream that is not yet connected to a
-            piped input stream.</summary>
+        <param name="snk">The piped input stream to connect to.</param>
+        <summary>Creates a piped output stream connected to the specified piped
+            input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedOutputStream#PipedOutputStream()" title="Reference documentation">Java documentation for <code>java.io.PipedOutputStream.PipedOutputStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedOutputStream#PipedOutputStream(java.io.PipedInputStream)" title="Reference documentation">Java documentation for <code>java.io.PipedOutputStream.PipedOutputStream(java.io.PipedInputStream)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PipedReader.xml b/docs/Mono.Android/en/Java.IO/PipedReader.xml
index aff0b26ca3..7bd77f8848 100644
--- a/docs/Mono.Android/en/Java.IO/PipedReader.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedReader.xml
@@ -88,13 +88,14 @@
         <Parameter Name="src" Type="Java.IO.PipedWriter" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
+        <param name="src">the stream to connect to.</param>
         <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so
-            that it is not yet #connect(java.</summary>
+            that it is connected to the piped writer
+            &lt;code&gt;src&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedReader#PipedReader()" title="Reference documentation">Java documentation for <code>java.io.PipedReader.PipedReader()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedReader#PipedReader(java.io.PipedWriter)" title="Reference documentation">Java documentation for <code>java.io.PipedReader.PipedReader(java.io.PipedWriter)</code>.</a>
             </format>
           </para>
           <para>
@@ -128,13 +129,14 @@
         <Parameter Name="pipeSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pipeSize">To be added.</param>
-        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so
-            that it is not yet #connect(java.</summary>
+        <param name="pipeSize">the size of the pipe's buffer.</param>
+        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so that it is not yet
+            <c>#connect(java.io.PipedWriter) connected</c> and uses
+            the specified pipe size for the pipe's buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedReader#PipedReader()" title="Reference documentation">Java documentation for <code>java.io.PipedReader.PipedReader()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedReader#PipedReader(int)" title="Reference documentation">Java documentation for <code>java.io.PipedReader.PipedReader(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -168,14 +170,15 @@
         <Parameter Name="pipeSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="pipeSize">To be added.</param>
-        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so
-            that it is not yet #connect(java.</summary>
+        <param name="src">the stream to connect to.</param>
+        <param name="pipeSize">the size of the pipe's buffer.</param>
+        <summary>Creates a &lt;code&gt;PipedReader&lt;/code&gt; so that it is connected
+            to the piped writer &lt;code&gt;src&lt;/code&gt; and uses the specified
+            pipe size for the pipe's buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedReader#PipedReader()" title="Reference documentation">Java documentation for <code>java.io.PipedReader.PipedReader()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedReader#PipedReader(java.io.PipedWriter,%20int)" title="Reference documentation">Java documentation for <code>java.io.PipedReader.PipedReader(java.io.PipedWriter, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -351,16 +354,18 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Reads the next character of data from this piped stream.</summary>
-        <returns>the next character of data, or &lt;code&gt;-1&lt;/code&gt; if the end of the
-                        stream is reached.</returns>
+        <param name="cbuf">the buffer into which the data is read.</param>
+        <param name="off">the start offset of the data.</param>
+        <param name="len">the maximum number of characters read.</param>
+        <summary>Reads up to &lt;code&gt;len&lt;/code&gt; characters of data from this piped
+            stream into an array of characters.</summary>
+        <returns>the total number of characters read into the buffer, or
+                        &lt;code&gt;-1&lt;/code&gt; if there is no more data because the end of
+                        the stream has been reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedReader#read()" title="Reference documentation">Java documentation for <code>java.io.PipedReader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedReader#read(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.PipedReader.read(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PipedWriter.xml b/docs/Mono.Android/en/Java.IO/PipedWriter.xml
index dcc6035fe4..3993796394 100644
--- a/docs/Mono.Android/en/Java.IO/PipedWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/PipedWriter.xml
@@ -89,13 +89,13 @@
         <Parameter Name="snk" Type="Java.IO.PipedReader" />
       </Parameters>
       <Docs>
-        <param name="snk">To be added.</param>
-        <summary>Creates a piped writer that is not yet connected to a
-            piped reader.</summary>
+        <param name="snk">The piped reader to connect to.</param>
+        <summary>Creates a piped writer connected to the specified piped
+            reader.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedWriter#PipedWriter()" title="Reference documentation">Java documentation for <code>java.io.PipedWriter.PipedWriter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedWriter#PipedWriter(java.io.PipedReader)" title="Reference documentation">Java documentation for <code>java.io.PipedWriter.PipedWriter(java.io.PipedReader)</code>.</a>
             </format>
           </para>
           <para>
@@ -372,15 +372,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="c">the &lt;code&gt;char&lt;/code&gt; to be written.</param>
-        <summary>Writes the specified &lt;code&gt;char&lt;/code&gt; to the piped output stream.</summary>
+        <param name="cbuf">the data.</param>
+        <param name="off">the start offset in the data.</param>
+        <param name="len">the number of characters to write.</param>
+        <summary>Writes &lt;code&gt;len&lt;/code&gt; characters from the specified character array
+            starting at offset &lt;code&gt;off&lt;/code&gt; to this piped output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PipedWriter#write(int)" title="Reference documentation">Java documentation for <code>java.io.PipedWriter.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PipedWriter#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.PipedWriter.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PrintStream.xml b/docs/Mono.Android/en/Java.IO/PrintStream.xml
index 0d864dfb7e..2f16b64a92 100644
--- a/docs/Mono.Android/en/Java.IO/PrintStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PrintStream.xml
@@ -115,17 +115,13 @@
         <Parameter Name="out" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="file">The file to use as the destination of this print stream.  If the
-                    file exists, then it will be truncated to zero size; otherwise,
-                    a new file will be created.  The output will be written to the
-                    file and is buffered.</param>
-        <summary>Creates a new print stream, without automatic line flushing, with the
-            specified file.</summary>
+        <param name="out">The output stream to which values and objects will be
+                               printed</param>
+        <summary>Creates a new print stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -159,17 +155,16 @@
         <Parameter Name="fileName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="file">The file to use as the destination of this print stream.  If the
-                    file exists, then it will be truncated to zero size; otherwise,
-                    a new file will be created.  The output will be written to the
-                    file and is buffered.</param>
+        <param name="fileName">The name of the file to use as the destination of this print
+                    stream.  If the file exists, then it will be truncated to
+                    zero size; otherwise, a new file will be created.  The output
+                    will be written to the file and is buffered.</param>
         <summary>Creates a new print stream, without automatic line flushing, with the
-            specified file.</summary>
+            specified file name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -204,17 +199,18 @@
         <Parameter Name="csn" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="csn">To be added.</param>
         <param name="file">The file to use as the destination of this print stream.  If the
                     file exists, then it will be truncated to zero size; otherwise,
                     a new file will be created.  The output will be written to the
                     file and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
         <summary>Creates a new print stream, without automatic line flushing, with the
-            specified file.</summary>
+            specified file and charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.File, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -274,18 +270,17 @@
         <Parameter Name="autoFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="autoFlush">To be added.</param>
-        <param name="file">The file to use as the destination of this print stream.  If the
-                    file exists, then it will be truncated to zero size; otherwise,
-                    a new file will be created.  The output will be written to the
-                    file and is buffered.</param>
-        <summary>Creates a new print stream, without automatic line flushing, with the
-            specified file.</summary>
+        <param name="out">The output stream to which values and objects will be
+                               printed</param>
+        <param name="autoFlush">A boolean; if true, the output buffer will be flushed
+                               whenever a byte array is written, one of the
+                               &lt;code&gt;println&lt;/code&gt; methods is invoked, or a newline
+                               character or byte (&lt;code&gt;'\n'&lt;/code&gt;) is written</param>
+        <summary>Creates a new print stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.OutputStream,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.OutputStream, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -320,18 +315,18 @@
         <Parameter Name="csn" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="csn">To be added.</param>
-        <param name="file">The file to use as the destination of this print stream.  If the
-                    file exists, then it will be truncated to zero size; otherwise,
-                    a new file will be created.  The output will be written to the
-                    file and is buffered.</param>
+        <param name="fileName">The name of the file to use as the destination of this print
+                    stream.  If the file exists, then it will be truncated to
+                    zero size; otherwise, a new file will be created.  The output
+                    will be written to the file and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
         <summary>Creates a new print stream, without automatic line flushing, with the
-            specified file.</summary>
+            specified file name and charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -369,19 +364,20 @@
         <Parameter Name="encoding" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="autoFlush">To be added.</param>
-        <param name="encoding">To be added.</param>
-        <param name="file">The file to use as the destination of this print stream.  If the
-                    file exists, then it will be truncated to zero size; otherwise,
-                    a new file will be created.  The output will be written to the
-                    file and is buffered.</param>
-        <summary>Creates a new print stream, without automatic line flushing, with the
-            specified file.</summary>
+        <param name="out">The output stream to which values and objects will be
+                               printed</param>
+        <param name="autoFlush">A boolean; if true, the output buffer will be flushed
+                               whenever a byte array is written, one of the
+                               &lt;code&gt;println&lt;/code&gt; methods is invoked, or a newline
+                               character or byte (&lt;code&gt;'\n'&lt;/code&gt;) is written</param>
+        <param name="encoding">The name of a supported
+                               &lt;a href="../lang/package-summary.html#charenc"&gt;
+                               character encoding&lt;/a&gt;</param>
+        <summary>Creates a new print stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#PrintStream(java.io.OutputStream,%20boolean,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.PrintStream(java.io.OutputStream, boolean, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -423,7 +419,6 @@
       </Parameters>
       <Docs>
         <param name="csq">To be added.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this output stream.</summary>
         <returns>This output stream</returns>
         <remarks>
@@ -503,7 +498,6 @@
       </Parameters>
       <Docs>
         <param name="csq">To be added.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this output stream.</summary>
         <returns>This output stream</returns>
         <remarks>
@@ -553,7 +547,6 @@
             to the target stream.</param>
         <param name="end">the index of the character following the last character of the
             subsequence appended to the target stream.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this output stream.</summary>
         <returns>This output stream</returns>
         <remarks>
@@ -597,7 +590,6 @@
         <param name="csq">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this output stream.</summary>
         <returns>This output stream</returns>
         <remarks>
@@ -1019,13 +1011,12 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="obj">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="obj">The &lt;code&gt;Object&lt;/code&gt; to be printed</param>
+        <summary>Prints an object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1060,13 +1051,12 @@
         <Parameter Name="b" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="b">The &lt;code&gt;boolean&lt;/code&gt; to be printed</param>
+        <summary>Prints a boolean value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(boolean)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1141,13 +1131,12 @@
         <Parameter Name="s" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="s">The array of chars to be printed</param>
+        <summary>Prints an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char[])" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1182,13 +1171,12 @@
         <Parameter Name="d" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="d">The &lt;code&gt;double&lt;/code&gt; to be printed</param>
+        <summary>Prints a double-precision floating-point number.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(double)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1223,13 +1211,12 @@
         <Parameter Name="i" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="i">The &lt;code&gt;int&lt;/code&gt; to be printed</param>
+        <summary>Prints an integer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(int)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1264,13 +1251,12 @@
         <Parameter Name="l" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="l">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="l">The &lt;code&gt;long&lt;/code&gt; to be printed</param>
+        <summary>Prints a long integer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(long)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1305,13 +1291,12 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="f">The &lt;code&gt;float&lt;/code&gt; to be printed</param>
+        <summary>Prints a floating-point number.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(float)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1346,13 +1331,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="s">The &lt;code&gt;String&lt;/code&gt; to be printed</param>
+        <summary>Prints a string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#print(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.print(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1839,12 +1823,12 @@
         <Parameter Name="x" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;Object&lt;/code&gt; to be printed.</param>
+        <summary>Prints an Object and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1879,12 +1863,12 @@
         <Parameter Name="x" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;boolean&lt;/code&gt; to be printed</param>
+        <summary>Prints a boolean and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(boolean)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1919,12 +1903,12 @@
         <Parameter Name="x" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;char&lt;/code&gt; to be printed.</param>
+        <summary>Prints a character and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(char)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(char)</code>.</a>
             </format>
           </para>
           <para>
@@ -1959,12 +1943,12 @@
         <Parameter Name="x" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">an array of chars to print.</param>
+        <summary>Prints an array of characters and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(char[])" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1999,12 +1983,12 @@
         <Parameter Name="x" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;double&lt;/code&gt; to be printed.</param>
+        <summary>Prints a double and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(double)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -2039,12 +2023,12 @@
         <Parameter Name="x" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;int&lt;/code&gt; to be printed.</param>
+        <summary>Prints an integer and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(int)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2079,12 +2063,12 @@
         <Parameter Name="x" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">a The &lt;code&gt;long&lt;/code&gt; to be printed.</param>
+        <summary>Prints a long and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(long)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2119,12 +2103,12 @@
         <Parameter Name="x" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;float&lt;/code&gt; to be printed.</param>
+        <summary>Prints a float and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(float)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2159,12 +2143,12 @@
         <Parameter Name="x" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;String&lt;/code&gt; to be printed.</param>
+        <summary>Prints a String and then terminate the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintStream#println()" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintStream#println(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintStream.println(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PrintWriter.xml b/docs/Mono.Android/en/Java.IO/PrintWriter.xml
index 56211aaae2..afc0aa0dd8 100644
--- a/docs/Mono.Android/en/Java.IO/PrintWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/PrintWriter.xml
@@ -97,17 +97,12 @@
         <Parameter Name="out" Type="Java.IO.Writer" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="file">The file to use as the destination of this writer.  If the file
-                    exists then it will be truncated to zero size; otherwise, a new
-                    file will be created.  The output will be written to the file
-                    and is buffered.</param>
-        <summary>Creates a new PrintWriter, without automatic line flushing, with the
-            specified file.</summary>
+        <param name="out">A character-output stream</param>
+        <summary>Creates a new PrintWriter, without automatic line flushing.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.Writer)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.Writer)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,17 +136,13 @@
         <Parameter Name="out" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="file">The file to use as the destination of this writer.  If the file
-                    exists then it will be truncated to zero size; otherwise, a new
-                    file will be created.  The output will be written to the file
-                    and is buffered.</param>
-        <summary>Creates a new PrintWriter, without automatic line flushing, with the
-            specified file.</summary>
+        <param name="out">An output stream</param>
+        <summary>Creates a new PrintWriter, without automatic line flushing, from an
+            existing OutputStream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,17 +176,16 @@
         <Parameter Name="fileName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="file">The file to use as the destination of this writer.  If the file
-                    exists then it will be truncated to zero size; otherwise, a new
-                    file will be created.  The output will be written to the file
-                    and is buffered.</param>
+        <param name="fileName">The name of the file to use as the destination of this writer.
+                    If the file exists then it will be truncated to zero size;
+                    otherwise, a new file will be created.  The output will be
+                    written to the file and is buffered.</param>
         <summary>Creates a new PrintWriter, without automatic line flushing, with the
-            specified file.</summary>
+            specified file name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -230,17 +220,18 @@
         <Parameter Name="csn" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="csn">To be added.</param>
         <param name="file">The file to use as the destination of this writer.  If the file
                     exists then it will be truncated to zero size; otherwise, a new
                     file will be created.  The output will be written to the file
                     and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
         <summary>Creates a new PrintWriter, without automatic line flushing, with the
-            specified file.</summary>
+            specified file and charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -277,18 +268,15 @@
         <Parameter Name="autoFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="autoFlush">To be added.</param>
-        <param name="file">The file to use as the destination of this writer.  If the file
-                    exists then it will be truncated to zero size; otherwise, a new
-                    file will be created.  The output will be written to the file
-                    and is buffered.</param>
-        <summary>Creates a new PrintWriter, without automatic line flushing, with the
-            specified file.</summary>
+        <param name="out">A character-output stream</param>
+        <param name="autoFlush">A boolean; if true, the <c>println</c>,
+                               <c>printf</c>, or <c>format</c> methods will
+                               flush the output buffer</param>
+        <summary>Creates a new PrintWriter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.Writer,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.Writer, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -346,18 +334,15 @@
         <Parameter Name="autoFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="autoFlush">To be added.</param>
-        <param name="file">The file to use as the destination of this writer.  If the file
-                    exists then it will be truncated to zero size; otherwise, a new
-                    file will be created.  The output will be written to the file
-                    and is buffered.</param>
-        <summary>Creates a new PrintWriter, without automatic line flushing, with the
-            specified file.</summary>
+        <param name="out">An output stream</param>
+        <param name="autoFlush">A boolean; if true, the <c>println</c>,
+                               <c>printf</c>, or <c>format</c> methods will
+                               flush the output buffer</param>
+        <summary>Creates a new PrintWriter from an existing OutputStream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.OutputStream,%20boolean)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.OutputStream, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -392,18 +377,18 @@
         <Parameter Name="csn" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="csn">To be added.</param>
-        <param name="file">The file to use as the destination of this writer.  If the file
-                    exists then it will be truncated to zero size; otherwise, a new
-                    file will be created.  The output will be written to the file
-                    and is buffered.</param>
+        <param name="fileName">The name of the file to use as the destination of this writer.
+                    If the file exists then it will be truncated to zero size;
+                    otherwise, a new file will be created.  The output will be
+                    written to the file and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
         <summary>Creates a new PrintWriter, without automatic line flushing, with the
-            specified file.</summary>
+            specified file name and charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.io.File)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#PrintWriter(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.PrintWriter(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -854,13 +839,12 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="obj">the object to print to the target.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="obj">The &lt;code&gt;Object&lt;/code&gt; to be printed</param>
+        <summary>Prints an object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -896,13 +880,12 @@
         <Parameter Name="b" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="b">The &lt;code&gt;boolean&lt;/code&gt; to be printed</param>
+        <summary>Prints a boolean value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(boolean)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -979,13 +962,12 @@
         <Parameter Name="s" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="s">The array of chars to be printed</param>
+        <summary>Prints an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char[])" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1021,13 +1003,12 @@
         <Parameter Name="d" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="d">The &lt;code&gt;double&lt;/code&gt; to be printed</param>
+        <summary>Prints a double-precision floating-point number.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(double)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1063,13 +1044,12 @@
         <Parameter Name="i" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="i">The &lt;code&gt;int&lt;/code&gt; to be printed</param>
+        <summary>Prints an integer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(int)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1105,13 +1085,12 @@
         <Parameter Name="l" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="l">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="l">The &lt;code&gt;long&lt;/code&gt; to be printed</param>
+        <summary>Prints a long integer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(long)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1147,13 +1126,12 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="f">The &lt;code&gt;float&lt;/code&gt; to be printed</param>
+        <summary>Prints a floating-point number.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(float)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1189,13 +1167,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="c">The &lt;code&gt;char&lt;/code&gt; to be printed</param>
-        <summary>Prints a character.</summary>
+        <param name="s">The &lt;code&gt;String&lt;/code&gt; to be printed</param>
+        <summary>Prints a string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#print(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.print(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1682,12 +1659,12 @@
         <Parameter Name="x" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">The &lt;code&gt;Object&lt;/code&gt; to be printed.</param>
+        <summary>Prints an Object and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1722,12 +1699,12 @@
         <Parameter Name="x" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the &lt;code&gt;boolean&lt;/code&gt; value to be printed</param>
+        <summary>Prints a boolean value and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(boolean)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1762,12 +1739,12 @@
         <Parameter Name="x" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the &lt;code&gt;char&lt;/code&gt; value to be printed</param>
+        <summary>Prints a character and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(char)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(char)</code>.</a>
             </format>
           </para>
           <para>
@@ -1802,12 +1779,12 @@
         <Parameter Name="x" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the array of &lt;code&gt;char&lt;/code&gt; values to be printed</param>
+        <summary>Prints an array of characters and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(char[])" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1842,12 +1819,13 @@
         <Parameter Name="x" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the &lt;code&gt;double&lt;/code&gt; value to be printed</param>
+        <summary>Prints a double-precision floating-point number and then terminates the
+            line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(double)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1882,12 +1860,12 @@
         <Parameter Name="x" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the &lt;code&gt;int&lt;/code&gt; value to be printed</param>
+        <summary>Prints an integer and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(int)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1922,12 +1900,12 @@
         <Parameter Name="x" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the &lt;code&gt;long&lt;/code&gt; value to be printed</param>
+        <summary>Prints a long integer and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(long)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1962,12 +1940,12 @@
         <Parameter Name="x" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the &lt;code&gt;float&lt;/code&gt; value to be printed</param>
+        <summary>Prints a floating-point number and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(float)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2002,12 +1980,12 @@
         <Parameter Name="x" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <summary>Terminates the current line by writing the line separator string.</summary>
+        <param name="x">the &lt;code&gt;String&lt;/code&gt; value to be printed</param>
+        <summary>Prints a String and then terminates the line.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#println()" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#println(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.println(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2390,15 +2368,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="buf">the buffer to write to the target.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="c">int specifying a character to be written.</param>
-        <summary>Writes a single character.</summary>
+        <param name="buf">Array of characters</param>
+        <param name="off">Offset from which to start writing characters</param>
+        <param name="len">Number of characters to write</param>
+        <summary>Writes A Portion of an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PrintWriter#write(int)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PrintWriter#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.PrintWriter.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml b/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml
index 8a921a0106..c4ba2325d4 100644
--- a/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/PushbackInputStream.xml
@@ -120,15 +120,16 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
         <param name="in">the input stream from which bytes will be read.</param>
+        <param name="size">the size of the pushback buffer.</param>
         <summary>Creates a &lt;code&gt;PushbackInputStream&lt;/code&gt;
+            with a pushback buffer of the specified &lt;code&gt;size&lt;/code&gt;,
             and saves its  argument, the input stream
             &lt;code&gt;in&lt;/code&gt;, for later use.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PushbackInputStream#PushbackInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.PushbackInputStream.PushbackInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PushbackInputStream#PushbackInputStream(java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.io.PushbackInputStream.PushbackInputStream(java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -333,13 +334,13 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">the &lt;code&gt;int&lt;/code&gt; value whose low-order
-                             byte is to be pushed back.</param>
-        <summary>Pushes back a byte by copying it to the front of the pushback buffer.</summary>
+        <param name="b">the byte array to push back</param>
+        <summary>Pushes back an array of bytes by copying it to the front of the
+            pushback buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PushbackInputStream#unread(int)" title="Reference documentation">Java documentation for <code>java.io.PushbackInputStream.unread(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PushbackInputStream#unread(byte[])" title="Reference documentation">Java documentation for <code>java.io.PushbackInputStream.unread(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -423,15 +424,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="b">the &lt;code&gt;int&lt;/code&gt; value whose low-order
-                             byte is to be pushed back.</param>
-        <summary>Pushes back a byte by copying it to the front of the pushback buffer.</summary>
+        <param name="b">the byte array to push back.</param>
+        <param name="off">the start offset of the data.</param>
+        <param name="len">the number of bytes to push back.</param>
+        <summary>Pushes back a portion of an array of bytes by copying it to the front
+            of the pushback buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PushbackInputStream#unread(int)" title="Reference documentation">Java documentation for <code>java.io.PushbackInputStream.unread(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PushbackInputStream#unread(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.PushbackInputStream.unread(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/PushbackReader.xml b/docs/Mono.Android/en/Java.IO/PushbackReader.xml
index 92e3983998..73722e8174 100644
--- a/docs/Mono.Android/en/Java.IO/PushbackReader.xml
+++ b/docs/Mono.Android/en/Java.IO/PushbackReader.xml
@@ -93,13 +93,13 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
         <param name="in">The reader from which characters will be read</param>
-        <summary>Creates a new pushback reader with a one-character pushback buffer.</summary>
+        <param name="size">The size of the pushback buffer</param>
+        <summary>Creates a new pushback reader with a pushback buffer of the given size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PushbackReader#PushbackReader(java.io.Reader)" title="Reference documentation">Java documentation for <code>java.io.PushbackReader.PushbackReader(java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PushbackReader#PushbackReader(java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>java.io.PushbackReader.PushbackReader(java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -252,14 +252,13 @@
         <Parameter Name="cbuf" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="c">The int value representing a character to be pushed back</param>
-        <summary>Pushes back a single character by copying it to the front of the
+        <param name="cbuf">Character array to push back</param>
+        <summary>Pushes back an array of characters by copying it to the front of the
             pushback buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PushbackReader#unread(int)" title="Reference documentation">Java documentation for <code>java.io.PushbackReader.unread(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PushbackReader#unread(char[])" title="Reference documentation">Java documentation for <code>java.io.PushbackReader.unread(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -344,16 +343,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="c">The int value representing a character to be pushed back</param>
-        <summary>Pushes back a single character by copying it to the front of the
-            pushback buffer.</summary>
+        <param name="cbuf">Character array</param>
+        <param name="off">Offset of first character to push back</param>
+        <param name="len">Number of characters to push back</param>
+        <summary>Pushes back a portion of an array of characters by copying it to the
+            front of the pushback buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/PushbackReader#unread(int)" title="Reference documentation">Java documentation for <code>java.io.PushbackReader.unread(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/PushbackReader#unread(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.PushbackReader.unread(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/RandomAccessFile.xml b/docs/Mono.Android/en/Java.IO/RandomAccessFile.xml
index f57077ba60..b84eb5aa6b 100644
--- a/docs/Mono.Android/en/Java.IO/RandomAccessFile.xml
+++ b/docs/Mono.Android/en/Java.IO/RandomAccessFile.xml
@@ -142,16 +142,14 @@
         <Parameter Name="mode" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="file">the file object</param>
-        <param name="mode">the access mode, as described
-                               &lt;a href="#mode"&gt;above&lt;/a&gt;</param>
-        <summary>Creates a random access file stream to read from, and optionally to
-            write to, the file specified by the <c>File</c> argument.</summary>
+        <param name="name">the system-dependent filename</param>
+        <param name="mode">the access &lt;a href="#mode"&gt;mode&lt;/a&gt;</param>
+        <summary>Creates a random access file stream to read from, and optionally
+            to write to, a file with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#RandomAccessFile(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.RandomAccessFile(java.io.File, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#RandomAccessFile(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.RandomAccessFile(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -467,14 +465,16 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Reads a byte of data from this file.</summary>
-        <returns>the next byte of data, or <c>-1</c> if the end of the
-                        file has been reached.</returns>
+        <param name="b">the buffer into which the data is read.</param>
+        <summary>Reads up to <c>b.length</c> bytes of data from this file
+            into an array of bytes.</summary>
+        <returns>the total number of bytes read into the buffer, or
+                        <c>-1</c> if there is no more data because the end of
+                        this file has been reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#read()" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#read(byte[])" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.read(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -513,16 +513,19 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Reads a byte of data from this file.</summary>
-        <returns>the next byte of data, or <c>-1</c> if the end of the
-                        file has been reached.</returns>
+        <param name="b">the buffer into which the data is read.</param>
+        <param name="off">the start offset in array <c>b</c>
+                              at which the data is written.</param>
+        <param name="len">the maximum number of bytes read.</param>
+        <summary>Reads up to <c>len</c> bytes of data from this file into an
+            array of bytes.</summary>
+        <returns>the total number of bytes read into the buffer, or
+                        <c>-1</c> if there is no more data because the end of
+                        the file has been reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#read()" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#read(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.read(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1020,15 +1023,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the buffer into which the data is read.</param>
-        <summary>Reads <c>b.length</c> bytes from this file into the byte
+        <param name="off">the start offset of the data.</param>
+        <param name="len">the number of bytes to read.</param>
+        <summary>Reads exactly <c>len</c> bytes from this file into the byte
             array, starting at the current file pointer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#readFully(byte[])" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.readFully(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#readFully(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.readFully(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1818,12 +1821,13 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">the <c>byte</c> to be written.</param>
-        <summary>Writes the specified byte to this file.</summary>
+        <param name="b">the data.</param>
+        <summary>Writes <c>b.length</c> bytes from the specified byte array
+            to this file, starting at the current file pointer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#write(int)" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#write(byte[])" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.write(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1910,14 +1914,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="b">the <c>byte</c> to be written.</param>
-        <summary>Writes the specified byte to this file.</summary>
+        <param name="b">the data.</param>
+        <param name="off">the start offset in the data.</param>
+        <param name="len">the number of bytes to write.</param>
+        <summary>Writes <c>len</c> bytes from the specified byte array
+            starting at offset <c>off</c> to this file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#write(int)" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/RandomAccessFile#write(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.RandomAccessFile.write(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/Reader.xml b/docs/Mono.Android/en/Java.IO/Reader.xml
index d836d1087f..22ecdb6085 100644
--- a/docs/Mono.Android/en/Java.IO/Reader.xml
+++ b/docs/Mono.Android/en/Java.IO/Reader.xml
@@ -104,13 +104,13 @@
         <Parameter Name="lock" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="lock">To be added.</param>
+        <param name="lock">The Object to synchronize on.</param>
         <summary>Creates a new character-stream reader whose critical sections will
-            synchronize on the reader itself.</summary>
+            synchronize on the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Reader#Reader()" title="Reference documentation">Java documentation for <code>java.io.Reader.Reader()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Reader#Reader(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.io.Reader.Reader(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -414,15 +414,14 @@
         <Parameter Name="target" Type="Java.Nio.CharBuffer" />
       </Parameters>
       <Docs>
-        <param name="target">the destination character buffer.</param>
-        <summary>Reads a single character.</summary>
-        <returns>The character read, as an integer in the range 0 to 65535
-                        (<c>0x00-0xffff</c>), or -1 if the end of the stream has
-                        been reached</returns>
+        <param name="target">the buffer to read characters into</param>
+        <summary>Attempts to read characters into the specified character buffer.</summary>
+        <returns>The number of characters added to the buffer, or
+                    -1 if this source of characters is at its end</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Reader#read()" title="Reference documentation">Java documentation for <code>java.io.Reader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Reader#read(java.nio.CharBuffer)" title="Reference documentation">Java documentation for <code>java.io.Reader.read(java.nio.CharBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -461,15 +460,15 @@
         <Parameter Name="cbuf" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <summary>Reads a single character.</summary>
-        <returns>The character read, as an integer in the range 0 to 65535
-                        (<c>0x00-0xffff</c>), or -1 if the end of the stream has
-                        been reached</returns>
+        <param name="cbuf">Destination buffer</param>
+        <summary>Reads characters into an array.</summary>
+        <returns>The number of characters read, or -1
+                         if the end of the stream
+                         has been reached</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Reader#read()" title="Reference documentation">Java documentation for <code>java.io.Reader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Reader#read(char[])" title="Reference documentation">Java documentation for <code>java.io.Reader.read(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -508,17 +507,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Reads a single character.</summary>
-        <returns>The character read, as an integer in the range 0 to 65535
-                        (<c>0x00-0xffff</c>), or -1 if the end of the stream has
-                        been reached</returns>
+        <param name="cbuf">Destination buffer</param>
+        <param name="off">Offset at which to start storing characters</param>
+        <param name="len">Maximum number of characters to read</param>
+        <summary>Reads characters into a portion of an array.</summary>
+        <returns>The number of characters read, or -1 if the end of the
+                        stream has been reached</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Reader#read()" title="Reference documentation">Java documentation for <code>java.io.Reader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Reader#read(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.Reader.read(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml b/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml
index 3b0ba066b5..fc56c3271d 100644
--- a/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml
+++ b/docs/Mono.Android/en/Java.IO/SequenceInputStream.xml
@@ -56,19 +56,15 @@
         <Parameter Name="e" Type="Java.Util.IEnumeration" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="s1">the first input stream to read.</param>
-        <param name="s2">the second input stream to read.</param>
-        <summary>Initializes a newly
-            created &lt;code&gt;SequenceInputStream&lt;/code&gt;
-            by remembering the two arguments, which
-            will be read in order, first &lt;code&gt;s1&lt;/code&gt;
-            and then &lt;code&gt;s2&lt;/code&gt;, to provide the
-            bytes to be read from this &lt;code&gt;SequenceInputStream&lt;/code&gt;.</summary>
+        <param name="e">an enumeration of input streams.</param>
+        <summary>Initializes a newly created &lt;code&gt;SequenceInputStream&lt;/code&gt;
+            by remembering the argument, which must
+            be an &lt;code&gt;Enumeration&lt;/code&gt;  that produces
+            objects whose run-time type is &lt;code&gt;InputStream&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/SequenceInputStream#SequenceInputStream(java.io.InputStream,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.SequenceInputStream.SequenceInputStream(java.io.InputStream, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/SequenceInputStream#SequenceInputStream(java.util.Enumeration)" title="Reference documentation">Java documentation for <code>java.io.SequenceInputStream.SequenceInputStream(java.util.Enumeration)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/StreamCorruptedException.xml b/docs/Mono.Android/en/Java.IO/StreamCorruptedException.xml
index 7b6d6a6e21..c4c7eac37c 100644
--- a/docs/Mono.Android/en/Java.IO/StreamCorruptedException.xml
+++ b/docs/Mono.Android/en/Java.IO/StreamCorruptedException.xml
@@ -88,12 +88,12 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Create a StreamCorruptedException and list no reason why thrown.</summary>
+        <param name="reason">String describing the reason for the exception.</param>
+        <summary>Create a StreamCorruptedException and list a reason why thrown.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/StreamCorruptedException#StreamCorruptedException()" title="Reference documentation">Java documentation for <code>java.io.StreamCorruptedException.StreamCorruptedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/StreamCorruptedException#StreamCorruptedException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.StreamCorruptedException.StreamCorruptedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml b/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml
index d2b91f1515..26a6568ab8 100644
--- a/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml
+++ b/docs/Mono.Android/en/Java.IO/StreamTokenizer.xml
@@ -56,12 +56,12 @@
         <Parameter Name="r" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="r">To be added.</param>
-        <summary>Private constructor that initializes everything except the streams.</summary>
+        <param name="r">a Reader object providing the input stream.</param>
+        <summary>Create a tokenizer that parses the given character stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/StreamTokenizer#StreamTokenizer()" title="Reference documentation">Java documentation for <code>java.io.StreamTokenizer.StreamTokenizer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/StreamTokenizer#StreamTokenizer(java.io.Reader)" title="Reference documentation">Java documentation for <code>java.io.StreamTokenizer.StreamTokenizer(java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -97,12 +97,13 @@
         <Parameter Name="is" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="is">To be added.</param>
-        <summary>Private constructor that initializes everything except the streams.</summary>
+        <param name="is">an input stream.</param>
+        <summary>Creates a stream tokenizer that parses the specified input
+            stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/StreamTokenizer#StreamTokenizer()" title="Reference documentation">Java documentation for <code>java.io.StreamTokenizer.StreamTokenizer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/StreamTokenizer#StreamTokenizer(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.io.StreamTokenizer.StreamTokenizer(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/StringReader.xml b/docs/Mono.Android/en/Java.IO/StringReader.xml
index 80727654ec..9167b5df15 100644
--- a/docs/Mono.Android/en/Java.IO/StringReader.xml
+++ b/docs/Mono.Android/en/Java.IO/StringReader.xml
@@ -188,16 +188,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">the maximum number of characters to read.</param>
-        <summary>Reads a single character.</summary>
-        <returns>The character read, or -1 if the end of the stream has been
-                        reached</returns>
+        <param name="cbuf">Destination buffer</param>
+        <param name="off">Offset at which to start writing characters</param>
+        <param name="len">Maximum number of characters to read</param>
+        <summary>Reads characters into a portion of an array.</summary>
+        <returns>The number of characters read, or -1 if the end of the
+                        stream has been reached</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/StringReader#read()" title="Reference documentation">Java documentation for <code>java.io.StringReader.read()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/StringReader#read(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.StringReader.read(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/StringWriter.xml b/docs/Mono.Android/en/Java.IO/StringWriter.xml
index e427924ef3..beeea169a0 100644
--- a/docs/Mono.Android/en/Java.IO/StringWriter.xml
+++ b/docs/Mono.Android/en/Java.IO/StringWriter.xml
@@ -89,13 +89,14 @@
         <Parameter Name="initialSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialSize">To be added.</param>
-        <summary>Create a new string writer using the default initial string-buffer
+        <param name="initialSize">The number of <c>char</c> values that will fit into this buffer
+                   before it is automatically expanded</param>
+        <summary>Create a new string writer using the specified initial string-buffer
             size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/StringWriter#StringWriter()" title="Reference documentation">Java documentation for <code>java.io.StringWriter.StringWriter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/StringWriter#StringWriter(int)" title="Reference documentation">Java documentation for <code>java.io.StringWriter.StringWriter(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -361,14 +362,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <summary>Write a single character.</summary>
+        <param name="cbuf">Array of characters</param>
+        <param name="off">Offset from which to start writing characters</param>
+        <param name="len">Number of characters to write</param>
+        <summary>Write a portion of an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/StringWriter#write(int)" title="Reference documentation">Java documentation for <code>java.io.StringWriter.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/StringWriter#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.StringWriter.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml b/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml
index de2f051f2c..ecb6847dfa 100644
--- a/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml
+++ b/docs/Mono.Android/en/Java.IO/UTFDataFormatException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;UTFDataFormatException&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its error detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;UTFDataFormatException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/UTFDataFormatException#UTFDataFormatException()" title="Reference documentation">Java documentation for <code>java.io.UTFDataFormatException.UTFDataFormatException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/UTFDataFormatException#UTFDataFormatException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.UTFDataFormatException.UTFDataFormatException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/UncheckedIOException.xml b/docs/Mono.Android/en/Java.IO/UncheckedIOException.xml
index 9754f96963..49a7f606fd 100644
--- a/docs/Mono.Android/en/Java.IO/UncheckedIOException.xml
+++ b/docs/Mono.Android/en/Java.IO/UncheckedIOException.xml
@@ -113,13 +113,13 @@
         <Parameter Name="cause" Type="Java.IO.IOException" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
+        <param name="message">the detail message, can be null</param>
         <param name="cause">the <c>IOException</c></param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/UncheckedIOException#UncheckedIOException(java.io.IOException)" title="Reference documentation">Java documentation for <code>java.io.UncheckedIOException.UncheckedIOException(java.io.IOException)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/UncheckedIOException#UncheckedIOException(java.lang.String,%20java.io.IOException)" title="Reference documentation">Java documentation for <code>java.io.UncheckedIOException.UncheckedIOException(java.lang.String, java.io.IOException)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/UnsupportedEncodingException.xml b/docs/Mono.Android/en/Java.IO/UnsupportedEncodingException.xml
index 3b52ac2229..ccbad6abaa 100644
--- a/docs/Mono.Android/en/Java.IO/UnsupportedEncodingException.xml
+++ b/docs/Mono.Android/en/Java.IO/UnsupportedEncodingException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an UnsupportedEncodingException without a detail message.</summary>
+        <param name="s">Describes the reason for the exception.</param>
+        <summary>Constructs an UnsupportedEncodingException with a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/UnsupportedEncodingException#UnsupportedEncodingException()" title="Reference documentation">Java documentation for <code>java.io.UnsupportedEncodingException.UnsupportedEncodingException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/UnsupportedEncodingException#UnsupportedEncodingException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.UnsupportedEncodingException.UnsupportedEncodingException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.IO/Writer.xml b/docs/Mono.Android/en/Java.IO/Writer.xml
index 3ef92bf239..afd41325f2 100644
--- a/docs/Mono.Android/en/Java.IO/Writer.xml
+++ b/docs/Mono.Android/en/Java.IO/Writer.xml
@@ -107,13 +107,13 @@
         <Parameter Name="lock" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="lock">To be added.</param>
+        <param name="lock">Object to synchronize on</param>
         <summary>Creates a new character-stream writer whose critical sections will
-            synchronize on the writer itself.</summary>
+            synchronize on the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Writer#Writer()" title="Reference documentation">Java documentation for <code>java.io.Writer.Writer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Writer#Writer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.io.Writer.Writer(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -177,7 +177,6 @@
       </Parameters>
       <Docs>
         <param name="csq">the character sequence appended to the target.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this writer.</summary>
         <returns>This writer</returns>
         <remarks>
@@ -261,7 +260,6 @@
       </Parameters>
       <Docs>
         <param name="csq">To be added.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this writer.</summary>
         <returns>This writer</returns>
         <remarks>
@@ -311,7 +309,6 @@
             to the target.</param>
         <param name="end">the index of the character following the last character of the
             subsequence appended to the target.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this writer.</summary>
         <returns>This writer</returns>
         <remarks>
@@ -356,7 +353,6 @@
         <param name="csq">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <param name="c">The 16-bit character to append</param>
         <summary>Appends the specified character to this writer.</summary>
         <returns>This writer</returns>
         <remarks>
@@ -692,13 +688,12 @@
         <Parameter Name="cbuf" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="c">int specifying a character to be written</param>
-        <summary>Writes a single character.</summary>
+        <param name="cbuf">Array of characters to be written</param>
+        <summary>Writes an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Writer#write(int)" title="Reference documentation">Java documentation for <code>java.io.Writer.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Writer#write(char[])" title="Reference documentation">Java documentation for <code>java.io.Writer.write(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -777,13 +772,12 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="str">the non-null string containing the characters to write.</param>
-        <param name="c">int specifying a character to be written</param>
-        <summary>Writes a single character.</summary>
+        <param name="str">String to be written</param>
+        <summary>Writes a string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Writer#write(int)" title="Reference documentation">Java documentation for <code>java.io.Writer.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Writer#write(java.lang.String)" title="Reference documentation">Java documentation for <code>java.io.Writer.write(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -822,15 +816,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="cbuf">To be added.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="c">int specifying a character to be written</param>
-        <summary>Writes a single character.</summary>
+        <param name="cbuf">Array of characters</param>
+        <param name="off">Offset from which to start writing characters</param>
+        <param name="len">Number of characters to write</param>
+        <summary>Writes a portion of an array of characters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Writer#write(int)" title="Reference documentation">Java documentation for <code>java.io.Writer.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Writer#write(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.Writer.write(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -870,15 +863,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="str">the non-null string containing the characters to write.</param>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="c">int specifying a character to be written</param>
-        <summary>Writes a single character.</summary>
+        <param name="str">A String</param>
+        <param name="off">Offset from which to start writing characters</param>
+        <param name="len">Number of characters to write</param>
+        <summary>Writes a portion of a string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/io/Writer#write(int)" title="Reference documentation">Java documentation for <code>java.io.Writer.write(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/io/Writer#write(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.io.Writer.write(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Interop/JavaObject.xml b/docs/Mono.Android/en/Java.Interop/JavaObject.xml
index 6531943f72..30b53330d5 100644
--- a/docs/Mono.Android/en/Java.Interop/JavaObject.xml
+++ b/docs/Mono.Android/en/Java.Interop/JavaObject.xml
@@ -146,7 +146,7 @@
       </Docs>
     </Member>
     <Member MemberName="DisposeUnlessReferenced">
-      <MemberSignature Language="C#" Value="public void DisposeUnlessReferenced ();" />
+      <MemberSignature Language="C#" Value="public virtual void DisposeUnlessReferenced ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void DisposeUnlessReferenced() cil managed" />
       <MemberSignature Language="DocId" Value="M:Java.Interop.JavaObject.DisposeUnlessReferenced" />
       <MemberSignature Language="F#" Value="abstract member DisposeUnlessReferenced : unit -&gt; unit&#xA;override this.DisposeUnlessReferenced : unit -&gt; unit" Usage="javaObject.DisposeUnlessReferenced " />
diff --git a/docs/Mono.Android/en/Java.Interop/JavaObjectArray`1.xml b/docs/Mono.Android/en/Java.Interop/JavaObjectArray`1.xml
index c119c9b584..399ce602c2 100644
--- a/docs/Mono.Android/en/Java.Interop/JavaObjectArray`1.xml
+++ b/docs/Mono.Android/en/Java.Interop/JavaObjectArray`1.xml
@@ -89,10 +89,10 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public JavaObjectArray (ref Java.Interop.JniObjectReference handle, Java.Interop.JniObjectReferenceOptions transfer);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Java.Interop.JniObjectReference&amp; handle, valuetype Java.Interop.JniObjectReferenceOptions transfer) cil managed" />
+      <MemberSignature Language="C#" Value="public JavaObjectArray (ref Java.Interop.JniObjectReference handle, Java.Interop.JniObjectReferenceOptions options);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Java.Interop.JniObjectReference&amp; handle, valuetype Java.Interop.JniObjectReferenceOptions options) cil managed" />
       <MemberSignature Language="DocId" Value="M:Java.Interop.JavaObjectArray`1.#ctor(Java.Interop.JniObjectReference@,Java.Interop.JniObjectReferenceOptions)" />
-      <MemberSignature Language="F#" Value="new Java.Interop.JavaObjectArray&lt;'T&gt; : JniObjectReference * Java.Interop.JniObjectReferenceOptions -&gt; Java.Interop.JavaObjectArray&lt;'T&gt;" Usage="new Java.Interop.JavaObjectArray&lt;'T&gt; (handle, transfer)" />
+      <MemberSignature Language="F#" Value="new Java.Interop.JavaObjectArray&lt;'T&gt; : JniObjectReference * Java.Interop.JniObjectReferenceOptions -&gt; Java.Interop.JavaObjectArray&lt;'T&gt;" Usage="new Java.Interop.JavaObjectArray&lt;'T&gt; (handle, options)" />
       <MemberType>Constructor</MemberType>
       <AssemblyInfo>
         <AssemblyName>Java.Interop</AssemblyName>
@@ -100,11 +100,11 @@
       </AssemblyInfo>
       <Parameters>
         <Parameter Name="handle" Type="Java.Interop.JniObjectReference" RefType="ref" />
-        <Parameter Name="transfer" Type="Java.Interop.JniObjectReferenceOptions" />
+        <Parameter Name="options" Type="Java.Interop.JniObjectReferenceOptions" />
       </Parameters>
       <Docs>
         <param name="handle">To be added.</param>
-        <param name="transfer">To be added.</param>
+        <param name="options">To be added.</param>
         <summary>To be added.</summary>
         <remarks>
           <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
@@ -158,6 +158,25 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="DisposeUnlessReferenced">
+      <MemberSignature Language="C#" Value="public override void DisposeUnlessReferenced ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance void DisposeUnlessReferenced() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JavaObjectArray`1.DisposeUnlessReferenced" />
+      <MemberSignature Language="F#" Value="override this.DisposeUnlessReferenced : unit -&gt; unit" Usage="javaObjectArray.DisposeUnlessReferenced " />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GetEnumerator">
       <MemberSignature Language="C#" Value="public override System.Collections.Generic.IEnumerator&lt;T&gt; GetEnumerator ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance class System.Collections.Generic.IEnumerator`1&lt;!T&gt; GetEnumerator() cil managed" />
@@ -170,8 +189,8 @@
       </AssemblyInfo>
       <Attributes>
         <Attribute>
-          <AttributeName Language="C#">[System.Runtime.CompilerServices.IteratorStateMachine(typeof(Java.Interop.JavaObjectArray&lt;&gt;+&lt;GetEnumerator&gt;d__11))]</AttributeName>
-          <AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.IteratorStateMachine(typeof(Java.Interop.JavaObjectArray&lt;&gt;+&lt;GetEnumerator&gt;d__11))&gt;]</AttributeName>
+          <AttributeName Language="C#">[System.Runtime.CompilerServices.IteratorStateMachine(typeof(Java.Interop.JavaObjectArray&lt;&gt;+&lt;GetEnumerator&gt;d__12))]</AttributeName>
+          <AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.IteratorStateMachine(typeof(Java.Interop.JavaObjectArray&lt;&gt;+&lt;GetEnumerator&gt;d__12))&gt;]</AttributeName>
         </Attribute>
       </Attributes>
       <ReturnValue>
diff --git a/docs/Mono.Android/en/Java.Interop/JavaPrimitiveArray`1.xml b/docs/Mono.Android/en/Java.Interop/JavaPrimitiveArray`1.xml
index a54cf1d391..3bb53186e8 100644
--- a/docs/Mono.Android/en/Java.Interop/JavaPrimitiveArray`1.xml
+++ b/docs/Mono.Android/en/Java.Interop/JavaPrimitiveArray`1.xml
@@ -133,6 +133,25 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="DisposeUnlessReferenced">
+      <MemberSignature Language="C#" Value="public override void DisposeUnlessReferenced ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance void DisposeUnlessReferenced() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JavaPrimitiveArray`1.DisposeUnlessReferenced" />
+      <MemberSignature Language="F#" Value="override this.DisposeUnlessReferenced : unit -&gt; unit" Usage="javaPrimitiveArray.DisposeUnlessReferenced " />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GetElements">
       <MemberSignature Language="C#" Value="public Java.Interop.JniArrayElements GetElements ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class Java.Interop.JniArrayElements GetElements() cil managed" />
diff --git a/docs/Mono.Android/en/Java.Interop/JniEnvironment+Arrays.xml b/docs/Mono.Android/en/Java.Interop/JniEnvironment+Arrays.xml
index a975452027..428c25c7db 100644
--- a/docs/Mono.Android/en/Java.Interop/JniEnvironment+Arrays.xml
+++ b/docs/Mono.Android/en/Java.Interop/JniEnvironment+Arrays.xml
@@ -18,6 +18,217 @@
     </remarks>
   </Docs>
   <Members>
+    <Member MemberName="CreateMarshalBooleanArray">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaBooleanArray? CreateMarshalBooleanArray (System.Collections.Generic.IEnumerable&lt;bool&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaBooleanArray CreateMarshalBooleanArray(class System.Collections.Generic.IEnumerable`1&lt;bool&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalBooleanArray(System.Collections.Generic.IEnumerable{System.Boolean})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalBooleanArray : seq&lt;bool&gt; -&gt; Java.Interop.JavaBooleanArray" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalBooleanArray value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaBooleanArray</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.Boolean&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalCharArray">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaCharArray? CreateMarshalCharArray (System.Collections.Generic.IEnumerable&lt;char&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaCharArray CreateMarshalCharArray(class System.Collections.Generic.IEnumerable`1&lt;char&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalCharArray(System.Collections.Generic.IEnumerable{System.Char})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalCharArray : seq&lt;char&gt; -&gt; Java.Interop.JavaCharArray" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalCharArray value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaCharArray</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.Char&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalDoubleArray">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaDoubleArray? CreateMarshalDoubleArray (System.Collections.Generic.IEnumerable&lt;double&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaDoubleArray CreateMarshalDoubleArray(class System.Collections.Generic.IEnumerable`1&lt;float64&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalDoubleArray(System.Collections.Generic.IEnumerable{System.Double})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalDoubleArray : seq&lt;double&gt; -&gt; Java.Interop.JavaDoubleArray" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalDoubleArray value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaDoubleArray</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.Double&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalInt16Array">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaInt16Array? CreateMarshalInt16Array (System.Collections.Generic.IEnumerable&lt;short&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaInt16Array CreateMarshalInt16Array(class System.Collections.Generic.IEnumerable`1&lt;int16&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalInt16Array(System.Collections.Generic.IEnumerable{System.Int16})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalInt16Array : seq&lt;int16&gt; -&gt; Java.Interop.JavaInt16Array" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalInt16Array value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaInt16Array</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.Int16&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalInt32Array">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaInt32Array? CreateMarshalInt32Array (System.Collections.Generic.IEnumerable&lt;int&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaInt32Array CreateMarshalInt32Array(class System.Collections.Generic.IEnumerable`1&lt;int32&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalInt32Array(System.Collections.Generic.IEnumerable{System.Int32})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalInt32Array : seq&lt;int&gt; -&gt; Java.Interop.JavaInt32Array" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalInt32Array value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaInt32Array</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.Int32&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalInt64Array">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaInt64Array? CreateMarshalInt64Array (System.Collections.Generic.IEnumerable&lt;long&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaInt64Array CreateMarshalInt64Array(class System.Collections.Generic.IEnumerable`1&lt;int64&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalInt64Array(System.Collections.Generic.IEnumerable{System.Int64})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalInt64Array : seq&lt;int64&gt; -&gt; Java.Interop.JavaInt64Array" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalInt64Array value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaInt64Array</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.Int64&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalObjectArray&lt;T&gt;">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaObjectArray&lt;T&gt;? CreateMarshalObjectArray&lt;T&gt; (System.Collections.Generic.IEnumerable&lt;T&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaObjectArray`1&lt;!!T&gt; CreateMarshalObjectArray&lt;T&gt;(class System.Collections.Generic.IEnumerable`1&lt;!!T&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalObjectArray``1(System.Collections.Generic.IEnumerable{``0})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalObjectArray : seq&lt;'T&gt; -&gt; Java.Interop.JavaObjectArray&lt;'T&gt;" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalObjectArray value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaObjectArray&lt;T&gt;</ReturnType>
+      </ReturnValue>
+      <TypeParameters>
+        <TypeParameter Name="T" />
+      </TypeParameters>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;T&gt;" />
+      </Parameters>
+      <Docs>
+        <typeparam name="T">To be added.</typeparam>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalSByteArray">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaSByteArray? CreateMarshalSByteArray (System.Collections.Generic.IEnumerable&lt;sbyte&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaSByteArray CreateMarshalSByteArray(class System.Collections.Generic.IEnumerable`1&lt;int8&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalSByteArray(System.Collections.Generic.IEnumerable{System.SByte})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalSByteArray : seq&lt;sbyte&gt; -&gt; Java.Interop.JavaSByteArray" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalSByteArray value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaSByteArray</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.SByte&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreateMarshalSingleArray">
+      <MemberSignature Language="C#" Value="public static Java.Interop.JavaSingleArray? CreateMarshalSingleArray (System.Collections.Generic.IEnumerable&lt;float&gt;? value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Java.Interop.JavaSingleArray CreateMarshalSingleArray(class System.Collections.Generic.IEnumerable`1&lt;float32&gt; value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Java.Interop.JniEnvironment.Arrays.CreateMarshalSingleArray(System.Collections.Generic.IEnumerable{System.Single})" />
+      <MemberSignature Language="F#" Value="static member CreateMarshalSingleArray : seq&lt;single&gt; -&gt; Java.Interop.JavaSingleArray" Usage="Java.Interop.JniEnvironment.Arrays.CreateMarshalSingleArray value" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Java.Interop</AssemblyName>
+        <AssemblyVersion>0.1.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Java.Interop.JavaSingleArray</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Collections.Generic.IEnumerable&lt;System.Single&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GetArrayLength">
       <MemberSignature Language="C#" Value="public static int GetArrayLength (Java.Interop.JniObjectReference array);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig int32 GetArrayLength(valuetype Java.Interop.JniObjectReference array) cil managed" />
diff --git a/docs/Mono.Android/en/Java.Lang.Annotation/AnnotationFormatError.xml b/docs/Mono.Android/en/Java.Lang.Annotation/AnnotationFormatError.xml
index 0b36ea0164..a294552030 100644
--- a/docs/Mono.Android/en/Java.Lang.Annotation/AnnotationFormatError.xml
+++ b/docs/Mono.Android/en/Java.Lang.Annotation/AnnotationFormatError.xml
@@ -55,14 +55,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">the detail message.</param>
+        <param name="cause">the cause (A <c>null</c> value is permitted, and
+                indicates that the cause is nonexistent or unknown.)</param>
         <summary>Constructs a new <c>AnnotationFormatError</c> with the specified
-            detail message.</summary>
+            cause and a detail message of
+            <c>(cause == null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/annotation/AnnotationFormatError#AnnotationFormatError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.annotation.AnnotationFormatError.AnnotationFormatError(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/annotation/AnnotationFormatError#AnnotationFormatError(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.annotation.AnnotationFormatError.AnnotationFormatError(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,14 +158,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">the detail message.</param>
+        <param name="message">the detail message</param>
+        <param name="cause">the cause (A <c>null</c> value is permitted, and
+                indicates that the cause is nonexistent or unknown.)</param>
         <summary>Constructs a new <c>AnnotationFormatError</c> with the specified
-            detail message.</summary>
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/annotation/AnnotationFormatError#AnnotationFormatError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.annotation.AnnotationFormatError.AnnotationFormatError(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/annotation/AnnotationFormatError#AnnotationFormatError(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.annotation.AnnotationFormatError.AnnotationFormatError(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/ConstantCallSite.xml b/docs/Mono.Android/en/Java.Lang.Invoke/ConstantCallSite.xml
index f91cc4a58b..bcbf35c9eb 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/ConstantCallSite.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/ConstantCallSite.xml
@@ -90,14 +90,13 @@
         <Parameter Name="createTargetHook" Type="Java.Lang.Invoke.MethodHandle" />
       </Parameters>
       <Docs>
-        <param name="targetType">To be added.</param>
-        <param name="createTargetHook">To be added.</param>
-        <param name="target">the target to be permanently associated with this call site</param>
-        <summary>Creates a call site with a permanent target.</summary>
+        <param name="targetType">the type of the method handle to be permanently associated with this call site</param>
+        <param name="createTargetHook">a method handle to invoke (on the call site) to produce the call site's target</param>
+        <summary>Creates a call site with a permanent target, possibly bound to the call site itself.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/ConstantCallSite#ConstantCallSite(java.lang.invoke.MethodHandle)" title="Reference documentation">Java documentation for <code>java.lang.invoke.ConstantCallSite.ConstantCallSite(java.lang.invoke.MethodHandle)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/ConstantCallSite#ConstantCallSite(java.lang.invoke.MethodType,%20java.lang.invoke.MethodHandle)" title="Reference documentation">Java documentation for <code>java.lang.invoke.ConstantCallSite.ConstantCallSite(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/IMethodHandleInfo.xml b/docs/Mono.Android/en/Java.Lang.Invoke/IMethodHandleInfo.xml
index f74bdcdf4c..86b3a61a74 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/IMethodHandleInfo.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/IMethodHandleInfo.xml
@@ -442,7 +442,6 @@
         <Parameter Name="lookup" Type="Java.Lang.Invoke.MethodHandles+Lookup" />
       </Parameters>
       <Docs>
-        <param name="&lt;T&gt;&lt;T&gt;">the desired type of the result, either <c>Member</c> or a subtype</param>
         <param name="expected">a class object representing the desired result type <c>T</c></param>
         <param name="lookup">the lookup object that created this MethodHandleInfo, or one with equivalent access privileges</param>
         <summary>Reflects the underlying member as a method, constructor, or field object.</summary>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/LambdaConversionException.xml b/docs/Mono.Android/en/Java.Lang.Invoke/LambdaConversionException.xml
index c1971606f2..bdb129646c 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/LambdaConversionException.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/LambdaConversionException.xml
@@ -85,12 +85,12 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>LambdaConversionException</c>.</summary>
+        <param name="cause">the cause</param>
+        <summary>Constructs a <c>LambdaConversionException</c> with a cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException()" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -121,12 +121,12 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a <c>LambdaConversionException</c>.</summary>
+        <param name="message">the detail message</param>
+        <summary>Constructs a <c>LambdaConversionException</c> with a message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException()" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -181,13 +181,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>LambdaConversionException</c>.</summary>
+        <param name="message">the detail message</param>
+        <param name="cause">the cause</param>
+        <summary>Constructs a <c>LambdaConversionException</c> with a message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException()" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -221,15 +221,16 @@
         <Parameter Name="writableStackTrace" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <param name="enableSuppression">To be added.</param>
-        <param name="writableStackTrace">To be added.</param>
-        <summary>Constructs a <c>LambdaConversionException</c>.</summary>
+        <param name="message">the detail message</param>
+        <param name="cause">the cause</param>
+        <param name="enableSuppression">whether or not suppressed exceptions are enabled</param>
+        <param name="writableStackTrace">whether or not the stack trace is writable</param>
+        <summary>Constructs a <c>LambdaConversionException</c> with a message,
+            cause, and other settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException()" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException#LambdaConversionException(java.lang.String,%20java.lang.Throwable,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.invoke.LambdaConversionException.LambdaConversionException(java.lang.String, java.lang.Throwable, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandle.xml b/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandle.xml
index 945c699ae5..1217a97a3d 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandle.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandle.xml
@@ -480,15 +480,15 @@
       </Parameters>
       <Docs>
         <param name="arguments">the arguments to pass to the target</param>
-        <summary>Performs a variable arity invocation, passing the arguments in the given list
+        <summary>Performs a variable arity invocation, passing the arguments in the given array
             to the method handle, as if via an inexact <c>#invoke invoke</c> from a call site
             which mentions only the type <c>Object</c>, and whose arity is the length
-            of the argument list.</summary>
+            of the argument array.</summary>
         <returns>the result returned by the target</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodHandle#invokeWithArguments(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodHandle.invokeWithArguments(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodHandle#invokeWithArguments(java.util.List)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodHandle.invokeWithArguments(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandles.xml b/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandles.xml
index d67ba43e6a..fdea510264 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandles.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/MethodHandles.xml
@@ -304,8 +304,8 @@
       </Parameters>
       <Docs>
         <param name="target">the method handle to invoke after the arguments are dropped</param>
-        <param name="valueTypes">the type(s) of the argument(s) to drop</param>
         <param name="pos">position of first argument to drop (zero for the leftmost)</param>
+        <param name="valueTypes">the type(s) of the argument(s) to drop</param>
         <summary>Produces a method handle which will discard some dummy arguments
             before calling some other specified <i>target</i> method handle.</summary>
         <returns>a method handle which drops arguments of the given types,
@@ -359,7 +359,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodHandles#dropArguments(java.lang.invoke.MethodHandle,%20int,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodHandles.dropArguments(java.lang.invoke.MethodHandle, int, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodHandles#dropArguments(java.lang.invoke.MethodHandle,%20int,%20java.util.List)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodHandles.dropArguments(java.lang.invoke.MethodHandle, int, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -666,11 +666,20 @@
         <Parameter Name="type" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="type">the type of the sole parameter and return value of the desired method handle</param>
+        <summary>Produces a method handle which returns its sole argument when invoked.</summary>
+        <returns>a unary method handle which accepts and returns the given type</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodHandles#identity(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodHandles.identity(java.lang.Class)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -879,7 +888,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodHandles#permuteArguments(java.lang.invoke.MethodHandle,%20java.lang.invoke.MethodType,%20int)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodHandles.permuteArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodHandles#permuteArguments(java.lang.invoke.MethodHandle,%20java.lang.invoke.MethodType,%20int[])" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodHandles.permuteArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/MethodType.xml b/docs/Mono.Android/en/Java.Lang.Invoke/MethodType.xml
index bcf461909d..6b3fa46a8d 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/MethodType.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/MethodType.xml
@@ -124,7 +124,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#appendParameterTypes(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.appendParameterTypes(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#appendParameterTypes(java.util.List)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.appendParameterTypes(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -439,14 +439,14 @@
         <Parameter Name="finalArray" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="finalArray">To be added.</param>
-        <param name="objectArgCount">number of parameters</param>
-        <summary>Finds or creates a method type whose components are all <c>Object</c>.</summary>
-        <returns>a generally applicable method type, for all calls of the given argument count</returns>
+        <param name="objectArgCount">number of parameters (excluding the final array parameter if any)</param>
+        <param name="finalArray">whether there will be a trailing array parameter, of type <c>Object[]</c></param>
+        <summary>Finds or creates a method type whose components are <c>Object</c> with an optional trailing <c>Object[]</c> array.</summary>
+        <returns>a generally applicable method type, for all calls of the given fixed argument count and a collected array of further arguments</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#genericMethodType(int)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.genericMethodType(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#genericMethodType(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.genericMethodType(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -609,7 +609,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#insertParameterTypes(int,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.insertParameterTypes(int, java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#insertParameterTypes(int,%20java.util.List)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.insertParameterTypes(int, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -684,14 +684,14 @@
         <Parameter Name="ptype0" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="ptype0">To be added.</param>
         <param name="rtype">the return type</param>
+        <param name="ptype0">the parameter type</param>
         <summary>Finds or creates a method type with the given components.</summary>
-        <returns>a method type with the given return value</returns>
+        <returns>a method type with the given return value and parameter type</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -726,14 +726,14 @@
         <Parameter Name="ptypes" Type="Java.Lang.Class[]" />
       </Parameters>
       <Docs>
-        <param name="ptypes">To be added.</param>
         <param name="rtype">the return type</param>
-        <summary>Finds or creates a method type with the given components.</summary>
-        <returns>a method type with the given return value</returns>
+        <param name="ptypes">the parameter types</param>
+        <summary>Finds or creates an instance of the given method type.</summary>
+        <returns>a method type with the given components</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class,%20java.lang.Class[])" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class, java.lang.Class[])</code>.</a>
             </format>
           </para>
           <para>
@@ -768,14 +768,14 @@
         <Parameter Name="ptypes" Type="Java.Lang.Invoke.MethodType" />
       </Parameters>
       <Docs>
-        <param name="ptypes">To be added.</param>
         <param name="rtype">the return type</param>
+        <param name="ptypes">the method type which supplies the parameter types</param>
         <summary>Finds or creates a method type with the given components.</summary>
-        <returns>a method type with the given return value</returns>
+        <returns>a method type with the given components</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class,%20java.lang.invoke.MethodType)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class, java.lang.invoke.MethodType)</code>.</a>
             </format>
           </para>
           <para>
@@ -810,14 +810,14 @@
         <Parameter Name="ptypes" Type="System.Collections.Generic.IList&lt;Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="ptypes">To be added.</param>
         <param name="rtype">the return type</param>
+        <param name="ptypes">the parameter types</param>
         <summary>Finds or creates a method type with the given components.</summary>
-        <returns>a method type with the given return value</returns>
+        <returns>a method type with the given components</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MethodType#methodType(java.lang.Class,%20java.util.List)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MethodType.methodType(java.lang.Class, java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -860,9 +860,9 @@
         </Parameter>
       </Parameters>
       <Docs>
+        <param name="rtype">the return type</param>
         <param name="ptype0">To be added.</param>
         <param name="ptypes">To be added.</param>
-        <param name="rtype">the return type</param>
         <summary>Finds or creates a method type with the given components.</summary>
         <returns>a method type with the given return value</returns>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/MutableCallSite.xml b/docs/Mono.Android/en/Java.Lang.Invoke/MutableCallSite.xml
index 32c412bb41..7a099fae31 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/MutableCallSite.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/MutableCallSite.xml
@@ -90,13 +90,12 @@
         <Parameter Name="type" Type="Java.Lang.Invoke.MethodType" />
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
-        <param name="target">the method handle that will be the initial target of the call site</param>
-        <summary>Creates a call site object with an initial target method handle.</summary>
+        <param name="type">the method type that this call site will have</param>
+        <summary>Creates a blank call site object with the given method type.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/MutableCallSite#MutableCallSite(java.lang.invoke.MethodHandle)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MutableCallSite.MutableCallSite(java.lang.invoke.MethodHandle)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/MutableCallSite#MutableCallSite(java.lang.invoke.MethodType)" title="Reference documentation">Java documentation for <code>java.lang.invoke.MutableCallSite.MutableCallSite(java.lang.invoke.MethodType)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/VolatileCallSite.xml b/docs/Mono.Android/en/Java.Lang.Invoke/VolatileCallSite.xml
index 5f547969a8..8888f59ba9 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/VolatileCallSite.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/VolatileCallSite.xml
@@ -89,13 +89,12 @@
         <Parameter Name="type" Type="Java.Lang.Invoke.MethodType" />
       </Parameters>
       <Docs>
-        <param name="type">To be added.</param>
-        <param name="target">the method handle that will be the initial target of the call site</param>
+        <param name="type">the method type that this call site will have</param>
         <summary>Creates a call site with a volatile binding to its target.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/VolatileCallSite#VolatileCallSite(java.lang.invoke.MethodHandle)" title="Reference documentation">Java documentation for <code>java.lang.invoke.VolatileCallSite.VolatileCallSite(java.lang.invoke.MethodHandle)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/VolatileCallSite#VolatileCallSite(java.lang.invoke.MethodType)" title="Reference documentation">Java documentation for <code>java.lang.invoke.VolatileCallSite.VolatileCallSite(java.lang.invoke.MethodType)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Invoke/WrongMethodTypeException.xml b/docs/Mono.Android/en/Java.Lang.Invoke/WrongMethodTypeException.xml
index e40fba626c..b80bde9faa 100644
--- a/docs/Mono.Android/en/Java.Lang.Invoke/WrongMethodTypeException.xml
+++ b/docs/Mono.Android/en/Java.Lang.Invoke/WrongMethodTypeException.xml
@@ -86,12 +86,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a <c>WrongMethodTypeException</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a <c>WrongMethodTypeException</c> with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/invoke/WrongMethodTypeException#WrongMethodTypeException()" title="Reference documentation">Java documentation for <code>java.lang.invoke.WrongMethodTypeException.WrongMethodTypeException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/invoke/WrongMethodTypeException#WrongMethodTypeException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.invoke.WrongMethodTypeException.WrongMethodTypeException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml b/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml
index 754fd8818d..7b473237c0 100644
--- a/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml
+++ b/docs/Mono.Android/en/Java.Lang.Ref/ReferenceQueue.xml
@@ -229,14 +229,17 @@
         <Parameter Name="timeout" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <summary>Removes the next reference object in this queue, blocking until one
-            becomes available.</summary>
-        <returns>A reference object, blocking until one becomes available</returns>
+        <param name="timeout">If positive, block for up to &lt;code&gt;timeout&lt;/code&gt;
+                             milliseconds while waiting for a reference to be
+                             added to this queue.  If zero, block indefinitely.</param>
+        <summary>Removes the next reference object in this queue, blocking until either
+            one becomes available or the given timeout period expires.</summary>
+        <returns>A reference object, if one was available within the specified
+                     timeout period, otherwise &lt;code&gt;null&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue#remove()" title="Reference documentation">Java documentation for <code>java.lang.ref.ReferenceQueue.remove()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue#remove(long)" title="Reference documentation">Java documentation for <code>java.lang.ref.ReferenceQueue.remove(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Ref/SoftReference.xml b/docs/Mono.Android/en/Java.Lang.Ref/SoftReference.xml
index b535478d0b..5a296f2b7c 100644
--- a/docs/Mono.Android/en/Java.Lang.Ref/SoftReference.xml
+++ b/docs/Mono.Android/en/Java.Lang.Ref/SoftReference.xml
@@ -96,13 +96,15 @@
         <Parameter Name="q" Type="Java.Lang.Ref.ReferenceQueue" />
       </Parameters>
       <Docs>
-        <param name="q">To be added.</param>
         <param name="referent">object the new soft reference will refer to</param>
-        <summary>Creates a new soft reference that refers to the given object.</summary>
+        <param name="q">the queue with which the reference is to be registered,
+                     or <c>null</c> if registration is not required</param>
+        <summary>Creates a new soft reference that refers to the given object and is
+            registered with the given queue.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ref/SoftReference#SoftReference(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.lang.ref.SoftReference.SoftReference(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ref/SoftReference#SoftReference(java.lang.Object,%20java.lang.ref.ReferenceQueue)" title="Reference documentation">Java documentation for <code>java.lang.ref.SoftReference.SoftReference(java.lang.Object, java.lang.ref.ReferenceQueue)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Ref/WeakReference.xml b/docs/Mono.Android/en/Java.Lang.Ref/WeakReference.xml
index ab1f2d0d7e..c9114c8ac8 100644
--- a/docs/Mono.Android/en/Java.Lang.Ref/WeakReference.xml
+++ b/docs/Mono.Android/en/Java.Lang.Ref/WeakReference.xml
@@ -96,13 +96,15 @@
         <Parameter Name="q" Type="Java.Lang.Ref.ReferenceQueue" />
       </Parameters>
       <Docs>
-        <param name="q">To be added.</param>
         <param name="referent">object the new weak reference will refer to</param>
-        <summary>Creates a new weak reference that refers to the given object.</summary>
+        <param name="q">the queue with which the reference is to be registered,
+                     or <c>null</c> if registration is not required</param>
+        <summary>Creates a new weak reference that refers to the given object and is
+            registered with the given queue.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ref/WeakReference#WeakReference(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.lang.ref.WeakReference.WeakReference(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ref/WeakReference#WeakReference(java.lang.Object,%20java.lang.ref.ReferenceQueue)" title="Reference documentation">Java documentation for <code>java.lang.ref.WeakReference.WeakReference(java.lang.Object, java.lang.ref.ReferenceQueue)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Reflect/AccessibleObject.xml b/docs/Mono.Android/en/Java.Lang.Reflect/AccessibleObject.xml
index 393d9c419f..5944820b99 100644
--- a/docs/Mono.Android/en/Java.Lang.Reflect/AccessibleObject.xml
+++ b/docs/Mono.Android/en/Java.Lang.Reflect/AccessibleObject.xml
@@ -527,14 +527,15 @@
         <Parameter Name="flag" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
-        <param name="flag">the new value for the <c>accessible</c> flag</param>
-        <summary>Set the <c>accessible</c> flag for this object to
-            the indicated boolean value.</summary>
+        <param name="array">the array of AccessibleObjects</param>
+        <param name="flag">the new value for the <c>accessible</c> flag
+                         in each object</param>
+        <summary>Convenience method to set the <c>accessible</c> flag for an
+            array of objects with a single security check (for efficiency).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject#setAccessible(boolean)" title="Reference documentation">Java documentation for <code>java.lang.reflect.AccessibleObject.setAccessible(boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject#setAccessible(java.lang.reflect.AccessibleObject[],%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.reflect.AccessibleObject.setAccessible(java.lang.reflect.AccessibleObject[], boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Reflect/Array.xml b/docs/Mono.Android/en/Java.Lang.Reflect/Array.xml
index 4bfcc1227b..711ef12c3a 100644
--- a/docs/Mono.Android/en/Java.Lang.Reflect/Array.xml
+++ b/docs/Mono.Android/en/Java.Lang.Reflect/Array.xml
@@ -617,17 +617,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="dimensions">To be added.</param>
-        <param name="componentType">the <c>Class</c> object representing the
-            component type of the new array</param>
-        <param name="length">the length of the new array</param>
-        <summary>Creates a new array with the specified component type and
-            length.</summary>
+        <param name="componentType">the <c>Class</c> object representing the component
+            type of the new array</param>
+        <param name="dimensions">an array of <c>int</c> representing the dimensions of
+            the new array</param>
+        <summary>Creates a new array
+            with the specified component type and dimensions.</summary>
         <returns>the new array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/Array#newInstance(java.lang.Class,%20int)" title="Reference documentation">Java documentation for <code>java.lang.reflect.Array.newInstance(java.lang.Class, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/Array#newInstance(java.lang.Class,%20int[])" title="Reference documentation">Java documentation for <code>java.lang.reflect.Array.newInstance(java.lang.Class, int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Reflect/GenericSignatureFormatError.xml b/docs/Mono.Android/en/Java.Lang.Reflect/GenericSignatureFormatError.xml
index 66c7f93d03..d598ebdcfb 100644
--- a/docs/Mono.Android/en/Java.Lang.Reflect/GenericSignatureFormatError.xml
+++ b/docs/Mono.Android/en/Java.Lang.Reflect/GenericSignatureFormatError.xml
@@ -89,12 +89,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new <c>GenericSignatureFormatError</c>.</summary>
+        <param name="message">the detail message, may be <c>null</c></param>
+        <summary>Constructs a new <c>GenericSignatureFormatError</c> with the
+            specified message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/GenericSignatureFormatError#GenericSignatureFormatError()" title="Reference documentation">Java documentation for <code>java.lang.reflect.GenericSignatureFormatError.GenericSignatureFormatError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/GenericSignatureFormatError#GenericSignatureFormatError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.reflect.GenericSignatureFormatError.GenericSignatureFormatError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Reflect/InvocationTargetException.xml b/docs/Mono.Android/en/Java.Lang.Reflect/InvocationTargetException.xml
index 91b142aedd..5d22517eac 100644
--- a/docs/Mono.Android/en/Java.Lang.Reflect/InvocationTargetException.xml
+++ b/docs/Mono.Android/en/Java.Lang.Reflect/InvocationTargetException.xml
@@ -89,13 +89,12 @@
         <Parameter Name="target" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="target">To be added.</param>
-        <summary>Constructs an <c>InvocationTargetException</c> with
-            <c>null</c> as the target exception.</summary>
+        <param name="target">the target exception</param>
+        <summary>Constructs a InvocationTargetException with a target exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/InvocationTargetException#InvocationTargetException()" title="Reference documentation">Java documentation for <code>java.lang.reflect.InvocationTargetException.InvocationTargetException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/InvocationTargetException#InvocationTargetException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.reflect.InvocationTargetException.InvocationTargetException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -128,14 +127,14 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="target">To be added.</param>
-        <param name="s">To be added.</param>
-        <summary>Constructs an <c>InvocationTargetException</c> with
-            <c>null</c> as the target exception.</summary>
+        <param name="target">the target exception</param>
+        <param name="s">the detail message</param>
+        <summary>Constructs a InvocationTargetException with a target exception
+            and a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/InvocationTargetException#InvocationTargetException()" title="Reference documentation">Java documentation for <code>java.lang.reflect.InvocationTargetException.InvocationTargetException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/InvocationTargetException#InvocationTargetException(java.lang.Throwable,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.reflect.InvocationTargetException.InvocationTargetException(java.lang.Throwable, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Reflect/MalformedParametersException.xml b/docs/Mono.Android/en/Java.Lang.Reflect/MalformedParametersException.xml
index e5998e6f77..e5fa57fe7a 100644
--- a/docs/Mono.Android/en/Java.Lang.Reflect/MalformedParametersException.xml
+++ b/docs/Mono.Android/en/Java.Lang.Reflect/MalformedParametersException.xml
@@ -89,13 +89,12 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Create a <c>MalformedParametersException</c> with an empty
-            reason.</summary>
+        <param name="reason">The reason for the exception.</param>
+        <summary>Create a <c>MalformedParametersException</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/MalformedParametersException#MalformedParametersException()" title="Reference documentation">Java documentation for <code>java.lang.reflect.MalformedParametersException.MalformedParametersException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/MalformedParametersException#MalformedParametersException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.reflect.MalformedParametersException.MalformedParametersException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Reflect/Proxy.xml b/docs/Mono.Android/en/Java.Lang.Reflect/Proxy.xml
index 9b2c56512a..57f4ae9d35 100644
--- a/docs/Mono.Android/en/Java.Lang.Reflect/Proxy.xml
+++ b/docs/Mono.Android/en/Java.Lang.Reflect/Proxy.xml
@@ -70,12 +70,14 @@
         <Parameter Name="h" Type="Java.Lang.Reflect.IInvocationHandler" />
       </Parameters>
       <Docs>
-        <param name="h">To be added.</param>
-        <summary>Prohibits instantiation.</summary>
+        <param name="h">the invocation handler for this proxy instance</param>
+        <summary>Constructs a new <c>Proxy</c> instance from a subclass
+            (typically, a dynamic proxy class) with the specified value
+            for its invocation handler.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/Proxy#Proxy()" title="Reference documentation">Java documentation for <code>java.lang.reflect.Proxy.Proxy()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/Proxy#Proxy(java.lang.reflect.InvocationHandler)" title="Reference documentation">Java documentation for <code>java.lang.reflect.Proxy.Proxy(java.lang.reflect.InvocationHandler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang.Reflect/UndeclaredThrowableException.xml b/docs/Mono.Android/en/Java.Lang.Reflect/UndeclaredThrowableException.xml
index 65963dd106..7412a7cb18 100644
--- a/docs/Mono.Android/en/Java.Lang.Reflect/UndeclaredThrowableException.xml
+++ b/docs/Mono.Android/en/Java.Lang.Reflect/UndeclaredThrowableException.xml
@@ -100,15 +100,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
         <param name="undeclaredThrowable">the undeclared checked exception
                      that was thrown</param>
+        <param name="s">the detail message</param>
         <summary>Constructs an <c>UndeclaredThrowableException</c> with the
-            specified <c>Throwable</c>.</summary>
+            specified <c>Throwable</c> and a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/reflect/UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.reflect.UndeclaredThrowableException.UndeclaredThrowableException(java.lang.Throwable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/reflect/UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.reflect.UndeclaredThrowableException.UndeclaredThrowableException(java.lang.Throwable, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml b/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml
index 248989dc23..d0fb9b1573 100644
--- a/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml
+++ b/docs/Mono.Android/en/Java.Lang/AbstractMethodError.xml
@@ -87,12 +87,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;AbstractMethodError&lt;/code&gt; with no detail  message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;AbstractMethodError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AbstractMethodError#AbstractMethodError()" title="Reference documentation">Java documentation for <code>java.lang.AbstractMethodError.AbstractMethodError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AbstractMethodError#AbstractMethodError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.AbstractMethodError.AbstractMethodError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/AbstractStringBuilder.xml b/docs/Mono.Android/en/Java.Lang/AbstractStringBuilder.xml
index aae6350e6e..f76e8d5e2b 100644
--- a/docs/Mono.Android/en/Java.Lang/AbstractStringBuilder.xml
+++ b/docs/Mono.Android/en/Java.Lang/AbstractStringBuilder.xml
@@ -105,7 +105,6 @@
       </Parameters>
       <Docs>
         <param name="s">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
         <summary>Appends the string representation of the <c>char</c>
             argument to this sequence.</summary>
         <returns>a reference to this object.</returns>
@@ -185,7 +184,6 @@
       </Parameters>
       <Docs>
         <param name="s">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
         <summary>Appends the string representation of the <c>char</c>
             argument to this sequence.</summary>
         <returns>a reference to this object.</returns>
@@ -234,7 +232,6 @@
         <param name="s">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
         <summary>Appends the string representation of the <c>char</c>
             argument to this sequence.</summary>
         <returns>a reference to this object.</returns>
@@ -274,7 +271,6 @@
         <param name="s">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
         <summary>Appends the string representation of the <c>char</c>
             argument to this sequence.</summary>
         <returns>a reference to this object.</returns>
@@ -685,18 +681,16 @@
         <Parameter Name="fromIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="str">any string.</param>
+        <param name="str">the substring for which to search.</param>
+        <param name="fromIndex">the index from which to start the search.</param>
         <summary>Returns the index within this string of the first occurrence of the
-            specified substring.</summary>
-        <returns>if the string argument occurs as a substring within this
-                     object, then the index of the first character of the first
-                     such substring is returned; if it does not occur as a
-                     substring, <c>-1</c> is returned.</returns>
+            specified substring, starting at the specified index.</summary>
+        <returns>the index within this string of the first occurrence of the
+                     specified substring, starting at the specified index.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AbstractStringBuilder#indexOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.AbstractStringBuilder.indexOf(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AbstractStringBuilder#indexOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.AbstractStringBuilder.indexOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -809,18 +803,16 @@
         <Parameter Name="fromIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
         <param name="str">the substring to search for.</param>
-        <summary>Returns the index within this string of the rightmost occurrence
-            of the specified substring.</summary>
-        <returns>if the string argument occurs one or more times as a substring
-                     within this object, then the index of the first character of
-                     the last such substring is returned. If it does not occur as
-                     a substring, <c>-1</c> is returned.</returns>
+        <param name="fromIndex">the index to start the search from.</param>
+        <summary>Returns the index within this string of the last occurrence of the
+            specified substring.</summary>
+        <returns>the index within this sequence of the last occurrence of the
+                     specified substring.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AbstractStringBuilder#lastIndexOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.AbstractStringBuilder.lastIndexOf(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AbstractStringBuilder#lastIndexOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.AbstractStringBuilder.lastIndexOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1142,15 +1134,15 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="end">To be added.</param>
         <param name="start">The beginning index, inclusive.</param>
+        <param name="end">The ending index, exclusive.</param>
         <summary>Returns a new <c>String</c> that contains a subsequence of
-            characters currently contained in this character sequence.</summary>
+            characters currently contained in this sequence.</summary>
         <returns>The new string.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AbstractStringBuilder#substring(int)" title="Reference documentation">Java documentation for <code>java.lang.AbstractStringBuilder.substring(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AbstractStringBuilder#substring(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.AbstractStringBuilder.substring(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ArithmeticException.xml b/docs/Mono.Android/en/Java.Lang/ArithmeticException.xml
index e11413dcde..493af8c77a 100644
--- a/docs/Mono.Android/en/Java.Lang/ArithmeticException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ArithmeticException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an <c>ArithmeticException</c> with no detail
-            message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an <c>ArithmeticException</c> with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ArithmeticException#ArithmeticException()" title="Reference documentation">Java documentation for <code>java.lang.ArithmeticException.ArithmeticException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ArithmeticException#ArithmeticException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ArithmeticException.ArithmeticException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml b/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml
index 4b46b0d432..41b1c6985e 100644
--- a/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ArrayIndexOutOfBoundsException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <summary>Constructs an &lt;code&gt;ArrayIndexOutOfBoundsException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="index">the illegal index.</param>
+        <summary>Constructs a new &lt;code&gt;ArrayIndexOutOfBoundsException&lt;/code&gt;
+            class with an argument indicating the illegal index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ArrayIndexOutOfBoundsException#ArrayIndexOutOfBoundsException()" title="Reference documentation">Java documentation for <code>java.lang.ArrayIndexOutOfBoundsException.ArrayIndexOutOfBoundsException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ArrayIndexOutOfBoundsException#ArrayIndexOutOfBoundsException(int)" title="Reference documentation">Java documentation for <code>java.lang.ArrayIndexOutOfBoundsException.ArrayIndexOutOfBoundsException(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +127,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;ArrayIndexOutOfBoundsException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;ArrayIndexOutOfBoundsException&lt;/code&gt; class
+            with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ArrayIndexOutOfBoundsException#ArrayIndexOutOfBoundsException()" title="Reference documentation">Java documentation for <code>java.lang.ArrayIndexOutOfBoundsException.ArrayIndexOutOfBoundsException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ArrayIndexOutOfBoundsException#ArrayIndexOutOfBoundsException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ArrayIndexOutOfBoundsException.ArrayIndexOutOfBoundsException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml b/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml
index 92ced3efb4..ff13b6df00 100644
--- a/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ArrayStoreException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;ArrayStoreException&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;ArrayStoreException&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ArrayStoreException#ArrayStoreException()" title="Reference documentation">Java documentation for <code>java.lang.ArrayStoreException.ArrayStoreException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ArrayStoreException#ArrayStoreException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ArrayStoreException.ArrayStoreException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/AssertionError.xml b/docs/Mono.Android/en/Java.Lang/AssertionError.xml
index 682b8aba78..157f39f94d 100644
--- a/docs/Mono.Android/en/Java.Lang/AssertionError.xml
+++ b/docs/Mono.Android/en/Java.Lang/AssertionError.xml
@@ -87,12 +87,14 @@
         <Parameter Name="detailMessage" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="detailMessage">value to be used in constructing detail message</param>
+        <summary>Constructs an AssertionError with its detail message derived
+            from the specified object, which is converted to a string as
+            defined in section 15.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +126,14 @@
         <Parameter Name="detailMessage" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="detailMessage">value to be used in constructing detail message</param>
+        <summary>Constructs an AssertionError with its detail message derived
+            from the specified &lt;code&gt;boolean&lt;/code&gt;, which is converted to
+            a string as defined in section 15.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(boolean)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -161,12 +165,14 @@
         <Parameter Name="detailMessage" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="detailMessage">value to be used in constructing detail message</param>
+        <summary>Constructs an AssertionError with its detail message derived
+            from the specified &lt;code&gt;char&lt;/code&gt;, which is converted to a
+            string as defined in section 15.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(char)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(char)</code>.</a>
             </format>
           </para>
           <para>
@@ -198,12 +204,14 @@
         <Parameter Name="detailMessage" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="detailMessage">value to be used in constructing detail message</param>
+        <summary>Constructs an AssertionError with its detail message derived
+            from the specified &lt;code&gt;double&lt;/code&gt;, which is converted to a
+            string as defined in section 15.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(double)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -235,12 +243,14 @@
         <Parameter Name="detailMessage" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="detailMessage">value to be used in constructing detail message</param>
+        <summary>Constructs an AssertionError with its detail message derived
+            from the specified &lt;code&gt;int&lt;/code&gt;, which is converted to a
+            string as defined in section 15.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(int)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -272,12 +282,14 @@
         <Parameter Name="detailMessage" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="detailMessage">value to be used in constructing detail message</param>
+        <summary>Constructs an AssertionError with its detail message derived
+            from the specified &lt;code&gt;long&lt;/code&gt;, which is converted to a
+            string as defined in section 15.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(long)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -309,12 +321,14 @@
         <Parameter Name="detailMessage" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="detailMessage">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="detailMessage">value to be used in constructing detail message</param>
+        <summary>Constructs an AssertionError with its detail message derived
+            from the specified &lt;code&gt;float&lt;/code&gt;, which is converted to a
+            string as defined in section 15.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(float)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -370,13 +384,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an AssertionError with no detail message.</summary>
+        <param name="message">the detail message, may be <c>null</c></param>
+        <param name="cause">the cause, may be <c>null</c></param>
+        <summary>Constructs a new <c>AssertionError</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError()" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/AssertionError#AssertionError(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.AssertionError.AssertionError(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Boolean.xml b/docs/Mono.Android/en/Java.Lang/Boolean.xml
index f21ee2277a..c551c9f2db 100644
--- a/docs/Mono.Android/en/Java.Lang/Boolean.xml
+++ b/docs/Mono.Android/en/Java.Lang/Boolean.xml
@@ -74,15 +74,13 @@
         <Parameter Name="value" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <param name="s">the string to be converted to a <c>Boolean</c>.</param>
-        <summary>Allocates a <c>Boolean</c> object representing the value
-            <c>true</c> if the string argument is not <c>null</c>
-            and is equal, ignoring case, to the string <c>"true"</c>.</summary>
+        <param name="value">the value of the <c>Boolean</c>.</param>
+        <summary>Allocates a <c>Boolean</c> object representing the
+            <c>value</c> argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Boolean#Boolean(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Boolean.Boolean(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Boolean#Boolean(boolean)" title="Reference documentation">Java documentation for <code>java.lang.Boolean.Boolean(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -366,15 +364,14 @@
         <Parameter Name="value" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Boolean</c> object.</summary>
-        <returns>the integer <c>1231</c> if this object represents
-            <c>true</c>; returns the integer <c>1237</c> if this
-            object represents <c>false</c>.</returns>
+        <param name="value">the value to hash</param>
+        <summary>Returns a hash code for a <c>boolean</c> value; compatible with
+            <c>Boolean.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>boolean</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Boolean#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Boolean.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Boolean#hashCode(boolean)" title="Reference documentation">Java documentation for <code>java.lang.Boolean.hashCode(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1203,14 +1200,14 @@
         <Parameter Name="b" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Returns a <c>String</c> object representing this Boolean's
-            value.</summary>
-        <returns>a string representation of this object.</returns>
+        <param name="b">the boolean to be converted</param>
+        <summary>Returns a <c>String</c> object representing the specified
+            boolean.</summary>
+        <returns>the string representation of the specified <c>boolean</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Boolean#toString()" title="Reference documentation">Java documentation for <code>java.lang.Boolean.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Boolean#toString(boolean)" title="Reference documentation">Java documentation for <code>java.lang.Boolean.toString(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1320,15 +1317,14 @@
         <Parameter Name="b" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="b">the boolean to convert to a <c>Boolean</c>.</param>
-        <param name="s">a string.</param>
-        <summary>Returns a <c>Boolean</c> with a value represented by the
-            specified string.</summary>
-        <returns>the <c>Boolean</c> value represented by the string.</returns>
+        <param name="b">a boolean value.</param>
+        <summary>Returns a <c>Boolean</c> instance representing the specified
+            <c>boolean</c> value.</summary>
+        <returns>a <c>Boolean</c> instance representing <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Boolean#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Boolean.valueOf(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Boolean#valueOf(boolean)" title="Reference documentation">Java documentation for <code>java.lang.Boolean.valueOf(boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/BootstrapMethodError.xml b/docs/Mono.Android/en/Java.Lang/BootstrapMethodError.xml
index 9f4423a34a..2474fe13bb 100644
--- a/docs/Mono.Android/en/Java.Lang/BootstrapMethodError.xml
+++ b/docs/Mono.Android/en/Java.Lang/BootstrapMethodError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>BootstrapMethodError</c> with no detail message.</summary>
+        <param name="cause">the cause, may be <c>null</c>.</param>
+        <summary>Constructs a <c>BootstrapMethodError</c> with the specified
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/BootstrapMethodError#BootstrapMethodError()" title="Reference documentation">Java documentation for <code>java.lang.BootstrapMethodError.BootstrapMethodError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/BootstrapMethodError#BootstrapMethodError(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.BootstrapMethodError.BootstrapMethodError(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +125,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a <c>BootstrapMethodError</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a <c>BootstrapMethodError</c> with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/BootstrapMethodError#BootstrapMethodError()" title="Reference documentation">Java documentation for <code>java.lang.BootstrapMethodError.BootstrapMethodError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/BootstrapMethodError#BootstrapMethodError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.BootstrapMethodError.BootstrapMethodError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -184,13 +186,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>BootstrapMethodError</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <param name="cause">the cause, may be <c>null</c>.</param>
+        <summary>Constructs a <c>BootstrapMethodError</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/BootstrapMethodError#BootstrapMethodError()" title="Reference documentation">Java documentation for <code>java.lang.BootstrapMethodError.BootstrapMethodError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/BootstrapMethodError#BootstrapMethodError(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.BootstrapMethodError.BootstrapMethodError(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Byte.xml b/docs/Mono.Android/en/Java.Lang/Byte.xml
index 716bc3d8f5..2c06409e25 100644
--- a/docs/Mono.Android/en/Java.Lang/Byte.xml
+++ b/docs/Mono.Android/en/Java.Lang/Byte.xml
@@ -118,15 +118,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="value">the value to be represented by the
-                             <c>Byte</c>.</param>
+        <param name="s">the <c>String</c> to be converted to a
+                             <c>Byte</c></param>
         <summary>Constructs a newly allocated <c>Byte</c> object that
-            represents the specified <c>byte</c> value.</summary>
+            represents the <c>byte</c> value indicated by the
+            <c>String</c> parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Byte#Byte(byte)" title="Reference documentation">Java documentation for <code>java.lang.Byte.Byte(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Byte#Byte(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Byte.Byte(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -460,14 +460,14 @@
         <Parameter Name="value" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Byte</c>; equal to the result
-            of invoking <c>intValue()</c>.</summary>
-        <returns>a hash code value for this <c>Byte</c></returns>
+        <param name="value">the value to hash</param>
+        <summary>Returns a hash code for a <c>byte</c> value; compatible with
+            <c>Byte.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>byte</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Byte#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Byte.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Byte#hashCode(byte)" title="Reference documentation">Java documentation for <code>java.lang.Byte.hashCode(byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -788,16 +788,18 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix to use when parsing.</param>
-        <param name="s">a <c>String</c> containing the
-                             <c>byte</c> representation to be parsed</param>
-        <summary>Parses the string argument as a signed decimal <c>byte</c>.</summary>
-        <returns>the <c>byte</c> value represented by the
-                             argument in decimal</returns>
+        <param name="s">the <c>String</c> containing the
+                             <c>byte</c>
+                             representation to be parsed</param>
+        <param name="radix">the radix to be used while parsing <c>s</c></param>
+        <summary>Parses the string argument as a signed <c>byte</c> in the
+            radix specified by the second argument.</summary>
+        <returns>the <c>byte</c> value represented by the string
+                              argument in the specified radix</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Byte#parseByte(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Byte.parseByte(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Byte#parseByte(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Byte.parseByte(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1410,15 +1412,14 @@
         <Parameter Name="b" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <summary>Returns a <c>String</c> object representing this
-            <c>Byte</c>'s value.</summary>
-        <returns>a string representation of the value of this object in
-                     base&amp;nbsp;10.</returns>
+        <param name="b">the <c>byte</c> to be converted</param>
+        <summary>Returns a new <c>String</c> object representing the
+            specified <c>byte</c>.</summary>
+        <returns>the string representation of the specified <c>byte</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Byte#toString()" title="Reference documentation">Java documentation for <code>java.lang.Byte.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Byte#toString(byte)" title="Reference documentation">Java documentation for <code>java.lang.Byte.toString(byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -1617,15 +1618,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="b">a byte value.</param>
-        <summary>Returns a <c>Byte</c> instance representing the specified
-            <c>byte</c> value.</summary>
-        <returns>a <c>Byte</c> instance representing <c>b</c>.</returns>
+        <param name="s">the string to be parsed</param>
+        <summary>Returns a <c>Byte</c> object holding the value
+            given by the specified <c>String</c>.</summary>
+        <returns>a <c>Byte</c> object holding the value
+                             represented by the string argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Byte#valueOf(byte)" title="Reference documentation">Java documentation for <code>java.lang.Byte.valueOf(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Byte#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Byte.valueOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1663,16 +1664,18 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="radix">the radix to use when parsing.</param>
-        <param name="b">a byte value.</param>
-        <summary>Returns a <c>Byte</c> instance representing the specified
-            <c>byte</c> value.</summary>
-        <returns>a <c>Byte</c> instance representing <c>b</c>.</returns>
+        <param name="s">the string to be parsed</param>
+        <param name="radix">the radix to be used in interpreting <c>s</c></param>
+        <summary>Returns a <c>Byte</c> object holding the value
+            extracted from the specified <c>String</c> when parsed
+            with the radix given by the second argument.</summary>
+        <returns>a <c>Byte</c> object holding the value
+                             represented by the string argument in the
+                             specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Byte#valueOf(byte)" title="Reference documentation">Java documentation for <code>java.lang.Byte.valueOf(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Byte#valueOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Byte.valueOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Character.xml b/docs/Mono.Android/en/Java.Lang/Character.xml
index 4ac5f8c894..a166c577a6 100644
--- a/docs/Mono.Android/en/Java.Lang/Character.xml
+++ b/docs/Mono.Android/en/Java.Lang/Character.xml
@@ -286,18 +286,16 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="seq">a sequence of <c>char</c> values (Unicode code
-            units)</param>
+        <param name="a">the <c>char</c> array</param>
         <param name="index">the index to the <c>char</c> values (Unicode
-            code units) in <c>seq</c> to be converted</param>
+            code units) in the <c>char</c> array to be converted</param>
         <summary>Returns the code point at the given index of the
-            <c>CharSequence</c>.</summary>
+            <c>char</c> array.</summary>
         <returns>the Unicode code point at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#codePointAt(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointAt(java.lang.CharSequence, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#codePointAt(char[],%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointAt(char[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -376,19 +374,19 @@
         <Parameter Name="limit" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="limit">the index after the last unit in <c>seq</c> that can be used.</param>
-        <param name="seq">a sequence of <c>char</c> values (Unicode code
-            units)</param>
+        <param name="a">the <c>char</c> array</param>
         <param name="index">the index to the <c>char</c> values (Unicode
-            code units) in <c>seq</c> to be converted</param>
+            code units) in the <c>char</c> array to be converted</param>
+        <param name="limit">the index after the last array element that
+            can be used in the <c>char</c> array</param>
         <summary>Returns the code point at the given index of the
-            <c>CharSequence</c>.</summary>
+            <c>char</c> array, where only array elements with
+            <c>index</c> less than <c>limit</c> can be used.</summary>
         <returns>the Unicode code point at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#codePointAt(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointAt(java.lang.CharSequence, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#codePointAt(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointAt(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -475,16 +473,15 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="seq">the <c>CharSequence</c> instance</param>
+        <param name="a">the <c>char</c> array</param>
         <param name="index">the index following the code point that should be returned</param>
         <summary>Returns the code point preceding the given index of the
-            <c>CharSequence</c>.</summary>
+            <c>char</c> array.</summary>
         <returns>the Unicode code point value before the given index.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#codePointBefore(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointBefore(java.lang.CharSequence, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#codePointBefore(char[],%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointBefore(char[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -561,17 +558,19 @@
         <Parameter Name="start" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="start">the index of the first element in <c>seq</c>.</param>
-        <param name="seq">the <c>CharSequence</c> instance</param>
+        <param name="a">the <c>char</c> array</param>
         <param name="index">the index following the code point that should be returned</param>
+        <param name="start">the index of the first array element in the
+            <c>char</c> array</param>
         <summary>Returns the code point preceding the given index of the
-            <c>CharSequence</c>.</summary>
+            <c>char</c> array, where only array elements with
+            <c>index</c> greater than or equal to <c>start</c>
+            can be used.</summary>
         <returns>the Unicode code point value before the given index.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#codePointBefore(java.lang.CharSequence,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointBefore(java.lang.CharSequence, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#codePointBefore(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointBefore(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -665,23 +664,17 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="offset">the inclusive index to begin counting at.</param>
-        <param name="count">the number of <c>char</c> values to look through in
-            <c>seq</c>.</param>
-        <param name="seq">the char sequence</param>
-        <param name="beginIndex">the index to the first <c>char</c> of
-            the text range.</param>
-        <param name="endIndex">the index after the last <c>char</c> of
-            the text range.</param>
-        <summary>Returns the number of Unicode code points in the text range of
-            the specified char sequence.</summary>
-        <returns>the number of Unicode code points in the specified text
-            range</returns>
+        <param name="a">the <c>char</c> array</param>
+        <param name="offset">the index of the first <c>char</c> in the
+            given <c>char</c> array</param>
+        <param name="count">the length of the subarray in <c>char</c>s</param>
+        <summary>Returns the number of Unicode code points in a subarray of the
+            <c>char</c> array argument.</summary>
+        <returns>the number of Unicode code points in the specified subarray</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#codePointCount(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointCount(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#codePointCount(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.codePointCount(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1123,17 +1116,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the character, including supplementary characters.</param>
-        <param name="ch">the character to be converted.</param>
+        <param name="codePoint">the character (Unicode code point) to be converted.</param>
         <param name="radix">the radix.</param>
-        <summary>Returns the numeric value of the character <c>ch</c> in the
-            specified radix.</summary>
+        <summary>Returns the numeric value of the specified character (Unicode
+            code point) in the specified radix.</summary>
         <returns>the numeric value represented by the character in the
                      specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#digit(char,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.digit(char, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#digit(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.digit(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2145,17 +2137,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the Unicode code point to get the directionality of.</param>
-        <param name="ch">
-          <c>char</c> for which the directionality property
-                       is requested.</param>
+        <param name="codePoint">the character (Unicode code point) for which
+                     the directionality property is requested.</param>
         <summary>Returns the Unicode directionality property for the given
-            character.</summary>
-        <returns>the directionality property of the <c>char</c> value.</returns>
+            character (Unicode code point).</summary>
+        <returns>the directionality property of the character.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#getDirectionality(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.getDirectionality(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#getDirectionality(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.getDirectionality(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2278,17 +2268,16 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point</param>
-        <param name="ch">the character to be converted.</param>
-        <summary>Returns the <c>int</c> value that the specified Unicode
-            character represents.</summary>
+        <param name="codePoint">the character (Unicode code point) to be converted.</param>
+        <summary>Returns the <c>int</c> value that the specified
+            character (Unicode code point) represents.</summary>
         <returns>the numeric value of the character, as a nonnegative <c>int</c>
-                      value; -2 if the character has a numeric value that is not a
+                     value; -2 if the character has a numeric value that is not a
                      nonnegative integer; -1 if the character has no numeric value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#getNumericValue(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.getNumericValue(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#getNumericValue(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.getNumericValue(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2365,15 +2354,14 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the Unicode code point to get the category of.</param>
-        <param name="ch">the character to be tested.</param>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
         <summary>Returns a value indicating a character's general category.</summary>
         <returns>a value of type <c>int</c> representing the
                      character's general category.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#getType(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.getType(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#getType(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.getType(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2408,14 +2396,14 @@
         <Parameter Name="value" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Character</c>; equal to the result
-            of invoking <c>charValue()</c>.</summary>
-        <returns>a hash code value for this <c>Character</c></returns>
+        <param name="value">The <c>char</c> for which to return a hash code.</param>
+        <summary>Returns a hash code for a <c>char</c> value; compatible with
+            <c>Character.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>char</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Character.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#hashCode(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.hashCode(char)</code>.</a>
             </format>
           </para>
           <para>
@@ -2656,16 +2644,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested</param>
-        <summary>Determines if a character is defined in Unicode.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if a character (Unicode code point) is defined in Unicode.</summary>
         <returns>
           <c>true</c> if the character has a defined meaning
                      in Unicode; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isDefined(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isDefined(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isDefined(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isDefined(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2743,16 +2730,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is a digit.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is a digit.</summary>
         <returns>
           <c>true</c> if the character is a digit;
                      <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isDigit(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isDigit(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isDigit(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isDigit(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2879,18 +2865,17 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character should be regarded as
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) should be regarded as
             an ignorable character in a Java identifier or a Unicode identifier.</summary>
         <returns>
           <c>true</c> if the character is an ignorable control
                      character that may be part of a Java or Unicode identifier;
-                      <c>false</c> otherwise.</returns>
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isIdentifierIgnorable(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isIdentifierIgnorable(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isIdentifierIgnorable(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isIdentifierIgnorable(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3012,9 +2997,8 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">To be added.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is an ISO control
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the referenced character (Unicode code point) is an ISO control
             character.</summary>
         <returns>
           <c>true</c> if the character is an ISO control character;
@@ -3022,7 +3006,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isISOControl(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isISOControl(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isISOControl(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isISOControl(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3101,9 +3085,8 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character may be part of a Java
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the character (Unicode code point) may be part of a Java
             identifier as other than the first character.</summary>
         <returns>
           <c>true</c> if the character may be part of a
@@ -3111,7 +3094,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isJavaIdentifierPart(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isJavaIdentifierPart(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isJavaIdentifierPart(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isJavaIdentifierPart(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3190,9 +3173,8 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the character (Unicode code point) is
             permissible as the first character in a Java identifier.</summary>
         <returns>
           <c>true</c> if the character may start a Java identifier;
@@ -3200,7 +3182,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isJavaIdentifierStart(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isJavaIdentifierStart(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isJavaIdentifierStart(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isJavaIdentifierStart(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3374,16 +3356,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is a letter.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is a letter.</summary>
         <returns>
           <c>true</c> if the character is a letter;
                      <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isLetter(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isLetter(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isLetter(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isLetter(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3461,16 +3442,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is a letter or digit.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is a letter or digit.</summary>
         <returns>
           <c>true</c> if the character is a letter or digit;
                      <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isLetterOrDigit(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isLetterOrDigit(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isLetterOrDigit(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isLetterOrDigit(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3548,16 +3528,16 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is a lowercase character.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is a
+            lowercase character.</summary>
         <returns>
           <c>true</c> if the character is lowercase;
                      <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isLowerCase(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isLowerCase(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isLowerCase(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isLowerCase(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3684,18 +3664,16 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">
-          <c>char</c> for which the mirrored property is requested</param>
-        <summary>Determines whether the character is mirrored according to the
-            Unicode specification.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines whether the specified character (Unicode code point)
+            is mirrored according to the Unicode specification.</summary>
         <returns>
-          <c>true</c> if the char is mirrored, <c>false</c>
-                    if the <c>char</c> is not mirrored or is not defined.</returns>
+          <c>true</c> if the character is mirrored, <c>false</c>
+                     if the character is not mirrored or is not defined.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isMirrored(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isMirrored(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isMirrored(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isMirrored(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3820,16 +3798,16 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is a Unicode space character.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is a
+            Unicode space character.</summary>
         <returns>
           <c>true</c> if the character is a space character;
                      <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isSpaceChar(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isSpaceChar(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isSpaceChar(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isSpaceChar(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4048,16 +4026,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is a titlecase character.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is a titlecase character.</summary>
         <returns>
           <c>true</c> if the character is titlecase;
                      <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isTitleCase(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isTitleCase(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isTitleCase(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isTitleCase(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4136,9 +4113,8 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character may be part of a Unicode
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) may be part of a Unicode
             identifier as other than the first character.</summary>
         <returns>
           <c>true</c> if the character may be part of a
@@ -4146,7 +4122,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isUnicodeIdentifierPart(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isUnicodeIdentifierPart(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isUnicodeIdentifierPart(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isUnicodeIdentifierPart(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4225,9 +4201,8 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is permissible as the
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is permissible as the
             first character in a Unicode identifier.</summary>
         <returns>
           <c>true</c> if the character may start a Unicode
@@ -4235,7 +4210,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isUnicodeIdentifierStart(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isUnicodeIdentifierStart(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isUnicodeIdentifierStart(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isUnicodeIdentifierStart(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4313,16 +4288,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is an uppercase character.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is an uppercase character.</summary>
         <returns>
           <c>true</c> if the character is uppercase;
                      <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isUpperCase(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isUpperCase(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isUpperCase(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isUpperCase(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4446,16 +4420,16 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be tested.</param>
-        <summary>Determines if the specified character is white space according to Java.</summary>
+        <param name="codePoint">the character (Unicode code point) to be tested.</param>
+        <summary>Determines if the specified character (Unicode code point) is
+            white space according to Java.</summary>
         <returns>
           <c>true</c> if the character is a Java whitespace
                      character; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#isWhitespace(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.isWhitespace(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#isWhitespace(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.isWhitespace(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5434,22 +5408,20 @@
         <Parameter Name="codePointOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="start">the inclusive index that marks the beginning of the
-            subsequence.</param>
-        <param name="count">the number of <c>char</c> values to include within the
-            subsequence.</param>
-        <param name="seq">the char sequence</param>
+        <param name="a">the <c>char</c> array</param>
+        <param name="start">the index of the first <c>char</c> of the
+            subarray</param>
+        <param name="count">the length of the subarray in <c>char</c>s</param>
         <param name="index">the index to be offset</param>
         <param name="codePointOffset">the offset in code points</param>
-        <summary>Returns the index within the given char sequence that is offset
-            from the given <c>index</c> by <c>codePointOffset</c>
-            code points.</summary>
-        <returns>the index within the char sequence</returns>
+        <summary>Returns the index within the given <c>char</c> subarray
+            that is offset from the given <c>index</c> by
+            <c>codePointOffset</c> code points.</summary>
+        <returns>the index within the subarray</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#offsetByCodePoints(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.offsetByCodePoints(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#offsetByCodePoints(char[],%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.offsetByCodePoints(char[], int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6551,17 +6523,19 @@
         <Parameter Name="dstIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination array to copy the encoded value into.</param>
-        <param name="dstIndex">the index in <c>dst</c> from where to start copying.</param>
-        <param name="codePoint">a Unicode code point</param>
+        <param name="codePoint">the character (Unicode code point) to be converted.</param>
+        <param name="dst">an array of <c>char</c> in which the
+            <c>codePoint</c>'s UTF-16 value is stored.</param>
+        <param name="dstIndex">the start index into the <c>dst</c>
+            array where the converted value is stored.</param>
         <summary>Converts the specified character (Unicode code point) to its
-            UTF-16 representation stored in a <c>char</c> array.</summary>
-        <returns>a <c>char</c> array having
-                    <c>codePoint</c>'s UTF-16 representation.</returns>
+            UTF-16 representation.</summary>
+        <returns>1 if the code point is a BMP code point, 2 if the
+            code point is a supplementary code point.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#toChars(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.toChars(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#toChars(int,%20char[],%20int)" title="Reference documentation">Java documentation for <code>java.lang.Character.toChars(int, char[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6691,16 +6665,16 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to check.</param>
-        <param name="ch">the character to be converted.</param>
-        <summary>Converts the character argument to lowercase using case
-            mapping information from the UnicodeData file.</summary>
-        <returns>the lowercase equivalent of the character, if any;
-                     otherwise, the character itself.</returns>
+        <param name="codePoint">the character (Unicode code point) to be converted.</param>
+        <summary>Converts the character (Unicode code point) argument to
+            lowercase using case mapping information from the UnicodeData
+            file.</summary>
+        <returns>the lowercase equivalent of the character (Unicode code
+                     point), if any; otherwise, the character itself.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#toLowerCase(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.toLowerCase(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#toLowerCase(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.toLowerCase(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6735,14 +6709,14 @@
         <Parameter Name="c" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Returns a <c>String</c> object representing this
-            <c>Character</c>'s value.</summary>
-        <returns>a string representation of this object.</returns>
+        <param name="c">the <c>char</c> to be converted</param>
+        <summary>Returns a <c>String</c> object representing the
+            specified <c>char</c>.</summary>
+        <returns>the string representation of the specified <c>char</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#toString()" title="Reference documentation">Java documentation for <code>java.lang.Character.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#toString(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.toString(char)</code>.</a>
             </format>
           </para>
           <para>
@@ -6820,16 +6794,15 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to convert.</param>
-        <param name="ch">the character to be converted.</param>
-        <summary>Converts the character argument to titlecase using case mapping
+        <param name="codePoint">the character (Unicode code point) to be converted.</param>
+        <summary>Converts the character (Unicode code point) argument to titlecase using case mapping
             information from the UnicodeData file.</summary>
         <returns>the titlecase equivalent of the character, if any;
                      otherwise, the character itself.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#toTitleCase(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.toTitleCase(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#toTitleCase(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.toTitleCase(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6907,16 +6880,16 @@
         <Parameter Name="codePoint" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoint">the code point to convert.</param>
-        <param name="ch">the character to be converted.</param>
-        <summary>Converts the character argument to uppercase using case mapping
-            information from the UnicodeData file.</summary>
+        <param name="codePoint">the character (Unicode code point) to be converted.</param>
+        <summary>Converts the character (Unicode code point) argument to
+            uppercase using case mapping information from the UnicodeData
+            file.</summary>
         <returns>the uppercase equivalent of the character, if any;
                      otherwise, the character itself.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Character#toUpperCase(char)" title="Reference documentation">Java documentation for <code>java.lang.Character.toUpperCase(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Character#toUpperCase(int)" title="Reference documentation">Java documentation for <code>java.lang.Character.toUpperCase(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Class.xml b/docs/Mono.Android/en/Java.Lang/Class.xml
index e0059f1f16..24fbef1d97 100644
--- a/docs/Mono.Android/en/Java.Lang/Class.xml
+++ b/docs/Mono.Android/en/Java.Lang/Class.xml
@@ -566,18 +566,17 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="initialize">To be added.</param>
-        <param name="loader">To be added.</param>
-        <param name="className">the fully qualified name of the desired class.</param>
+        <param name="name">fully qualified name of the desired class</param>
+        <param name="initialize">if <c>true</c> the class will be initialized.
+                              See Section 12.4 of &lt;em&gt;The Java Language Specification&lt;/em&gt;.</param>
+        <param name="loader">class loader from which the class must be loaded</param>
         <summary>Returns the <c>Class</c> object associated with the class or
-            interface with the given string name.</summary>
-        <returns>the <c>Class</c> object for the class with the
-                        specified name.</returns>
+            interface with the given string name, using the given class loader.</summary>
+        <returns>class object representing the desired class</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Class#forName(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Class.forName(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Class#forName(java.lang.String,%20boolean,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.lang.Class.forName(java.lang.String, boolean, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ClassCastException.xml b/docs/Mono.Android/en/Java.Lang/ClassCastException.xml
index 4520111816..c0191e38c6 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassCastException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassCastException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;ClassCastException&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;ClassCastException&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassCastException#ClassCastException()" title="Reference documentation">Java documentation for <code>java.lang.ClassCastException.ClassCastException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassCastException#ClassCastException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ClassCastException.ClassCastException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ClassCircularityError.xml b/docs/Mono.Android/en/Java.Lang/ClassCircularityError.xml
index fd2a042689..c5ed98fb3f 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassCircularityError.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassCircularityError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a <c>ClassCircularityError</c> with no detail message.</summary>
+        <param name="s">The detail message</param>
+        <summary>Constructs a <c>ClassCircularityError</c> with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassCircularityError#ClassCircularityError()" title="Reference documentation">Java documentation for <code>java.lang.ClassCircularityError.ClassCircularityError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassCircularityError#ClassCircularityError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ClassCircularityError.ClassCircularityError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml b/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml
index 0544d63f99..ad1207a1b6 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassFormatError.xml
@@ -89,12 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;ClassFormatError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;ClassFormatError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassFormatError#ClassFormatError()" title="Reference documentation">Java documentation for <code>java.lang.ClassFormatError.ClassFormatError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassFormatError#ClassFormatError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ClassFormatError.ClassFormatError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ClassLoader.xml b/docs/Mono.Android/en/Java.Lang/ClassLoader.xml
index a36b993932..631c06c4ab 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassLoader.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassLoader.xml
@@ -89,14 +89,13 @@
         <Parameter Name="parent" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
-        <summary>Creates a new class loader using the <c>ClassLoader</c> returned by
-            the method <c>#getSystemClassLoader()
-            &lt;tt&gt;getSystemClassLoader()&lt;/tt&gt;</c> as the parent class loader.</summary>
+        <param name="parent">The parent class loader</param>
+        <summary>Creates a new class loader using the specified parent class loader for
+            delegation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassLoader#ClassLoader()" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.ClassLoader()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassLoader#ClassLoader(java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.ClassLoader(java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -199,24 +198,19 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="name">The expected &lt;a href="#name"&gt;binary name&lt;/a&gt;. of the class, or
-                    <c>null</c> if not known</param>
-        <param name="b">The bytes that make up the class data. The bytes from positions
-                    <c>b.position()</c> through <c>b.position() + b.limit() -1
-                    </c> should have the format of a valid class file as defined by
+        <param name="b">The bytes that make up the class data.  The bytes in positions
+                    <c>off</c> through <c>off+len-1</c> should have the format
+                    of a valid class file as defined by
                     &lt;cite&gt;The Java&amp;trade; Virtual Machine Specification&lt;/cite&gt;.</param>
-        <param name="protectionDomain">The ProtectionDomain of the class, or <c>null</c>.</param>
-        <summary>Converts a <c>java.nio.ByteBuffer &lt;tt&gt;ByteBuffer&lt;/tt&gt;</c>
-            into an instance of class <c>Class</c>,
-            with an optional <c>ProtectionDomain</c>.</summary>
-        <returns>The <c>Class</c> object created from the data,
-                     and optional <c>ProtectionDomain</c>.</returns>
+        <param name="off">The start offset in <c>b</c> of the class data</param>
+        <param name="len">The length of the class data</param>
+        <summary>Converts an array of bytes into an instance of class <c>Class</c>.</summary>
+        <returns>The <c>Class</c> object that was created from the specified
+                     class data</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassLoader#defineClass(java.lang.String,%20java.nio.ByteBuffer,%20java.security.ProtectionDomain)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.defineClass(java.lang.String, java.nio.ByteBuffer, java.security.ProtectionDomain)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassLoader#defineClass(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.defineClass(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -314,24 +308,21 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="name">The expected &lt;a href="#name"&gt;binary name&lt;/a&gt;. of the class, or
+        <param name="name">The expected &lt;a href="#name"&gt;binary name&lt;/a&gt; of the class, or
                     <c>null</c> if not known</param>
-        <param name="b">The bytes that make up the class data. The bytes from positions
-                    <c>b.position()</c> through <c>b.position() + b.limit() -1
-                    </c> should have the format of a valid class file as defined by
+        <param name="b">The bytes that make up the class data.  The bytes in positions
+                    <c>off</c> through <c>off+len-1</c> should have the format
+                    of a valid class file as defined by
                     &lt;cite&gt;The Java&amp;trade; Virtual Machine Specification&lt;/cite&gt;.</param>
-        <param name="protectionDomain">The ProtectionDomain of the class, or <c>null</c>.</param>
-        <summary>Converts a <c>java.nio.ByteBuffer &lt;tt&gt;ByteBuffer&lt;/tt&gt;</c>
-            into an instance of class <c>Class</c>,
-            with an optional <c>ProtectionDomain</c>.</summary>
-        <returns>The <c>Class</c> object created from the data,
-                     and optional <c>ProtectionDomain</c>.</returns>
+        <param name="off">The start offset in <c>b</c> of the class data</param>
+        <param name="len">The length of the class data</param>
+        <summary>Converts an array of bytes into an instance of class <c>Class</c>.</summary>
+        <returns>The <c>Class</c> object that was created from the specified
+                     class data.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassLoader#defineClass(java.lang.String,%20java.nio.ByteBuffer,%20java.security.ProtectionDomain)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.defineClass(java.lang.String, java.nio.ByteBuffer, java.security.ProtectionDomain)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassLoader#defineClass(java.lang.String,%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.defineClass(java.lang.String, byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -375,24 +366,23 @@
         <Parameter Name="protectionDomain" Type="Java.Security.ProtectionDomain" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="name">The expected &lt;a href="#name"&gt;binary name&lt;/a&gt;. of the class, or
+        <param name="name">The expected &lt;a href="#name"&gt;binary name&lt;/a&gt; of the class, or
                     <c>null</c> if not known</param>
-        <param name="b">The bytes that make up the class data. The bytes from positions
-                    <c>b.position()</c> through <c>b.position() + b.limit() -1
-                    </c> should have the format of a valid class file as defined by
+        <param name="b">The bytes that make up the class data. The bytes in positions
+                    <c>off</c> through <c>off+len-1</c> should have the format
+                    of a valid class file as defined by
                     &lt;cite&gt;The Java&amp;trade; Virtual Machine Specification&lt;/cite&gt;.</param>
-        <param name="protectionDomain">The ProtectionDomain of the class, or <c>null</c>.</param>
-        <summary>Converts a <c>java.nio.ByteBuffer &lt;tt&gt;ByteBuffer&lt;/tt&gt;</c>
-            into an instance of class <c>Class</c>,
+        <param name="off">The start offset in <c>b</c> of the class data</param>
+        <param name="len">The length of the class data</param>
+        <param name="protectionDomain">The ProtectionDomain of the class</param>
+        <summary>Converts an array of bytes into an instance of class <c>Class</c>,
             with an optional <c>ProtectionDomain</c>.</summary>
         <returns>The <c>Class</c> object created from the data,
                      and optional <c>ProtectionDomain</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassLoader#defineClass(java.lang.String,%20java.nio.ByteBuffer,%20java.security.ProtectionDomain)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.defineClass(java.lang.String, java.nio.ByteBuffer, java.security.ProtectionDomain)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassLoader#defineClass(java.lang.String,%20byte[],%20int,%20int,%20java.security.ProtectionDomain)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.defineClass(java.lang.String, byte[], int, int, java.security.ProtectionDomain)</code>.</a>
             </format>
           </para>
           <para>
@@ -1176,16 +1166,14 @@
         <Parameter Name="resolve" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="resolve">Indicates if the class should be resolved after loading. This
-            parameter is ignored on the Android reference implementation;
-            classes are not resolved.</param>
         <param name="name">The &lt;a href="#name"&gt;binary name&lt;/a&gt; of the class</param>
+        <param name="resolve">If <c>true</c> then resolve the class</param>
         <summary>Loads the class with the specified &lt;a href="#name"&gt;binary name&lt;/a&gt;.</summary>
         <returns>The resulting <c>Class</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassLoader#loadClass(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.loadClass(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassLoader#loadClass(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.ClassLoader.loadClass(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml b/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml
index ab77e7b03a..b72b74d587 100644
--- a/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ClassNotFoundException.xml
@@ -90,12 +90,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;ClassNotFoundException&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;ClassNotFoundException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassNotFoundException#ClassNotFoundException()" title="Reference documentation">Java documentation for <code>java.lang.ClassNotFoundException.ClassNotFoundException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassNotFoundException#ClassNotFoundException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ClassNotFoundException.ClassNotFoundException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -151,13 +152,15 @@
         <Parameter Name="ex" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="ex">To be added.</param>
-        <summary>Constructs a &lt;code&gt;ClassNotFoundException&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message</param>
+        <param name="ex">the exception that was raised while loading the class</param>
+        <summary>Constructs a &lt;code&gt;ClassNotFoundException&lt;/code&gt; with the
+            specified detail message and optional exception that was
+            raised while loading the class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ClassNotFoundException#ClassNotFoundException()" title="Reference documentation">Java documentation for <code>java.lang.ClassNotFoundException.ClassNotFoundException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ClassNotFoundException#ClassNotFoundException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.ClassNotFoundException.ClassNotFoundException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml b/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml
index d9d0932058..fa32e9dbad 100644
--- a/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml
+++ b/docs/Mono.Android/en/Java.Lang/CloneNotSupportedException.xml
@@ -91,13 +91,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;CloneNotSupportedException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;CloneNotSupportedException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/CloneNotSupportedException#CloneNotSupportedException()" title="Reference documentation">Java documentation for <code>java.lang.CloneNotSupportedException.CloneNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/CloneNotSupportedException#CloneNotSupportedException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.CloneNotSupportedException.CloneNotSupportedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Double.xml b/docs/Mono.Android/en/Java.Lang/Double.xml
index 090d5b2c66..fb53877f65 100644
--- a/docs/Mono.Android/en/Java.Lang/Double.xml
+++ b/docs/Mono.Android/en/Java.Lang/Double.xml
@@ -109,14 +109,14 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="value">the value to be represented by the <c>Double</c>.</param>
+        <param name="s">a string to be converted to a <c>Double</c>.</param>
         <summary>Constructs a newly allocated <c>Double</c> object that
-            represents the primitive <c>double</c> argument.</summary>
+            represents the floating-point value of type <c>double</c>
+            represented by the string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Double#Double(double)" title="Reference documentation">Java documentation for <code>java.lang.Double.Double(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Double#Double(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Double.Double(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -450,13 +450,14 @@
         <Parameter Name="value" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Double</c> object.</summary>
-        <returns>a <c>hash code</c> value for this object.</returns>
+        <param name="value">the value to hash</param>
+        <summary>Returns a hash code for a <c>double</c> value; compatible with
+            <c>Double.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>double</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Double#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Double.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Double#hashCode(double)" title="Reference documentation">Java documentation for <code>java.lang.Double.hashCode(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -530,17 +531,16 @@
         <Parameter Name="v" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="v">To be added.</param>
-        <summary>Returns <c>true</c> if this <c>Double</c> value is
-            infinitely large in magnitude, <c>false</c> otherwise.</summary>
+        <param name="v">the value to be tested.</param>
+        <summary>Returns <c>true</c> if the specified number is infinitely
+            large in magnitude, <c>false</c> otherwise.</summary>
         <returns>
-          <c>true</c> if the value represented by this object is
-                     positive infinity or negative infinity;
-                     <c>false</c> otherwise.</returns>
+          <c>true</c> if the value of the argument is positive
+                     infinity or negative infinity; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Double#isInfinite()" title="Reference documentation">Java documentation for <code>java.lang.Double.isInfinite()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Double#isInfinite(double)" title="Reference documentation">Java documentation for <code>java.lang.Double.isInfinite(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -575,16 +575,16 @@
         <Parameter Name="v" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="v">To be added.</param>
-        <summary>Returns <c>true</c> if this <c>Double</c> value is
-            a Not-a-Number (NaN), <c>false</c> otherwise.</summary>
+        <param name="v">the value to be tested.</param>
+        <summary>Returns <c>true</c> if the specified number is a
+            Not-a-Number (NaN) value, <c>false</c> otherwise.</summary>
         <returns>
-          <c>true</c> if the value represented by this object is
-                     NaN; <c>false</c> otherwise.</returns>
+          <c>true</c> if the value of the argument is NaN;
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Double#isNaN()" title="Reference documentation">Java documentation for <code>java.lang.Double.isNaN()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Double#isNaN(double)" title="Reference documentation">Java documentation for <code>java.lang.Double.isNaN(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -2006,13 +2006,14 @@
         <Parameter Name="d" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="d">the double to convert to a string.</param>
-        <summary>Returns a string representation of this <c>Double</c> object.</summary>
-        <returns>a <c>String</c> representation of this object.</returns>
+        <param name="d">the <c>double</c> to be converted.</param>
+        <summary>Returns a string representation of the <c>double</c>
+            argument.</summary>
+        <returns>a string representation of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Double#toString()" title="Reference documentation">Java documentation for <code>java.lang.Double.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Double#toString(double)" title="Reference documentation">Java documentation for <code>java.lang.Double.toString(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -2127,15 +2128,16 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="d">a double value.</param>
-        <summary>Returns a <c>Double</c> instance representing the specified
-            <c>double</c> value.</summary>
-        <returns>a <c>Double</c> instance representing <c>d</c>.</returns>
+        <param name="s">the string to be parsed.</param>
+        <summary>Returns a <c>Double</c> object holding the
+            <c>double</c> value represented by the argument string
+            <c>s</c>.</summary>
+        <returns>a <c>Double</c> object holding the value
+                        represented by the <c>String</c> argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Double#valueOf(double)" title="Reference documentation">Java documentation for <code>java.lang.Double.valueOf(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Double#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Double.valueOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Error.xml b/docs/Mono.Android/en/Java.Lang/Error.xml
index fb8b12461f..a030b39983 100644
--- a/docs/Mono.Android/en/Java.Lang/Error.xml
+++ b/docs/Mono.Android/en/Java.Lang/Error.xml
@@ -89,12 +89,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new error with <c>null</c> as its detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new error with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Error#Error()" title="Reference documentation">Java documentation for <code>java.lang.Error.Error()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Error#Error(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.Error.Error(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,12 +131,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new error with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message. The detail message is saved for
+                     later retrieval by the <c>#getMessage()</c> method.</param>
+        <summary>Constructs a new error with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Error#Error()" title="Reference documentation">Java documentation for <code>java.lang.Error.Error()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Error#Error(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Error.Error(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,13 +193,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new error with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new error with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Error#Error()" title="Reference documentation">Java documentation for <code>java.lang.Error.Error()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Error#Error(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.Error.Error(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -228,15 +239,20 @@
         <Parameter Name="writableStackTrace" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <param name="enableSuppression">To be added.</param>
-        <param name="writableStackTrace">To be added.</param>
-        <summary>Constructs a new error with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message.</param>
+        <param name="cause">the cause.  (A <c>null</c> value is permitted,
+            and indicates that the cause is nonexistent or unknown.)</param>
+        <param name="enableSuppression">whether or not suppression is enabled
+                                     or disabled</param>
+        <param name="writableStackTrace">whether or not the stack trace should
+                                      be writable</param>
+        <summary>Constructs a new error with the specified detail message,
+            cause, suppression enabled or disabled, and writable stack
+            trace enabled or disabled.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Error#Error()" title="Reference documentation">Java documentation for <code>java.lang.Error.Error()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Error#Error(java.lang.String,%20java.lang.Throwable,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.Error.Error(java.lang.String, java.lang.Throwable, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Exception.xml b/docs/Mono.Android/en/Java.Lang/Exception.xml
index d94004f866..a6535aa8c6 100644
--- a/docs/Mono.Android/en/Java.Lang/Exception.xml
+++ b/docs/Mono.Android/en/Java.Lang/Exception.xml
@@ -89,12 +89,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new exception with <c>null</c> as its detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Exception#Exception()" title="Reference documentation">Java documentation for <code>java.lang.Exception.Exception()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Exception#Exception(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.Exception.Exception(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,12 +131,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new exception with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message. The detail message is saved for
+                     later retrieval by the <c>#getMessage()</c> method.</param>
+        <summary>Constructs a new exception with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Exception#Exception()" title="Reference documentation">Java documentation for <code>java.lang.Exception.Exception()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Exception#Exception(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Exception.Exception(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,13 +193,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new exception with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Exception#Exception()" title="Reference documentation">Java documentation for <code>java.lang.Exception.Exception()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Exception#Exception(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.Exception.Exception(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml b/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml
index fb8dc51a8f..c82e426b96 100644
--- a/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml
+++ b/docs/Mono.Android/en/Java.Lang/ExceptionInInitializerError.xml
@@ -89,14 +89,14 @@
         <Parameter Name="thrown" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="thrown">To be added.</param>
-        <summary>Constructs an &lt;code&gt;ExceptionInInitializerError&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its detail message string and with no saved
-            throwable object.</summary>
+        <param name="thrown">The exception thrown</param>
+        <summary>Constructs a new &lt;code&gt;ExceptionInInitializerError&lt;/code&gt; class by
+            saving a reference to the &lt;code&gt;Throwable&lt;/code&gt; object thrown for
+            later retrieval by the <c>#getException()</c> method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ExceptionInInitializerError#ExceptionInInitializerError()" title="Reference documentation">Java documentation for <code>java.lang.ExceptionInInitializerError.ExceptionInInitializerError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ExceptionInInitializerError#ExceptionInInitializerError(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.ExceptionInInitializerError.ExceptionInInitializerError(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -128,14 +128,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;ExceptionInInitializerError&lt;/code&gt; with
-            &lt;code&gt;null&lt;/code&gt; as its detail message string and with no saved
-            throwable object.</summary>
+        <param name="s">the detail message</param>
+        <summary>Constructs an ExceptionInInitializerError with the specified detail
+            message string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ExceptionInInitializerError#ExceptionInInitializerError()" title="Reference documentation">Java documentation for <code>java.lang.ExceptionInInitializerError.ExceptionInInitializerError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ExceptionInInitializerError#ExceptionInInitializerError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ExceptionInInitializerError.ExceptionInInitializerError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Float.xml b/docs/Mono.Android/en/Java.Lang/Float.xml
index bb8228f769..0fecedc458 100644
--- a/docs/Mono.Android/en/Java.Lang/Float.xml
+++ b/docs/Mono.Android/en/Java.Lang/Float.xml
@@ -111,11 +111,11 @@
       <Docs>
         <param name="value">the value to be represented by the <c>Float</c>.</param>
         <summary>Constructs a newly allocated <c>Float</c> object that
-            represents the argument converted to type <c>float</c>.</summary>
+            represents the primitive <c>float</c> argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Float#Float(double)" title="Reference documentation">Java documentation for <code>java.lang.Float.Float(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Float#Float(float)" title="Reference documentation">Java documentation for <code>java.lang.Float.Float(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -147,14 +147,14 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="value">the value to be represented by the <c>Float</c>.</param>
+        <param name="s">a string to be converted to a <c>Float</c>.</param>
         <summary>Constructs a newly allocated <c>Float</c> object that
-            represents the argument converted to type <c>float</c>.</summary>
+            represents the floating-point value of type <c>float</c>
+            represented by the string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Float#Float(double)" title="Reference documentation">Java documentation for <code>java.lang.Float.Float(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Float#Float(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Float.Float(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -487,13 +487,14 @@
         <Parameter Name="value" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Float</c> object.</summary>
-        <returns>a hash code value for this object.</returns>
+        <param name="value">the value to hash</param>
+        <summary>Returns a hash code for a <c>float</c> value; compatible with
+            <c>Float.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>float</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Float#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Float.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Float#hashCode(float)" title="Reference documentation">Java documentation for <code>java.lang.Float.hashCode(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -610,17 +611,16 @@
         <Parameter Name="v" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="v">To be added.</param>
-        <summary>Returns <c>true</c> if this <c>Float</c> value is
-            infinitely large in magnitude, <c>false</c> otherwise.</summary>
+        <param name="v">the value to be tested.</param>
+        <summary>Returns <c>true</c> if the specified number is infinitely
+            large in magnitude, <c>false</c> otherwise.</summary>
         <returns>
-          <c>true</c> if the value represented by this object is
-                     positive infinity or negative infinity;
-                     <c>false</c> otherwise.</returns>
+          <c>true</c> if the argument is positive infinity or
+                     negative infinity; <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Float#isInfinite()" title="Reference documentation">Java documentation for <code>java.lang.Float.isInfinite()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Float#isInfinite(float)" title="Reference documentation">Java documentation for <code>java.lang.Float.isInfinite(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -655,16 +655,16 @@
         <Parameter Name="v" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="v">To be added.</param>
-        <summary>Returns <c>true</c> if this <c>Float</c> value is a
-            Not-a-Number (NaN), <c>false</c> otherwise.</summary>
+        <param name="v">the value to be tested.</param>
+        <summary>Returns <c>true</c> if the specified number is a
+            Not-a-Number (NaN) value, <c>false</c> otherwise.</summary>
         <returns>
-          <c>true</c> if the value represented by this object is
-                     NaN; <c>false</c> otherwise.</returns>
+          <c>true</c> if the argument is NaN;
+                     <c>false</c> otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Float#isNaN()" title="Reference documentation">Java documentation for <code>java.lang.Float.isNaN()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Float#isNaN(float)" title="Reference documentation">Java documentation for <code>java.lang.Float.isNaN(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1850,13 +1850,14 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">the float to convert to a string.</param>
-        <summary>Returns a string representation of this <c>Float</c> object.</summary>
-        <returns>a <c>String</c> representation of this object.</returns>
+        <param name="f">the float to be converted.</param>
+        <summary>Returns a string representation of the <c>float</c>
+            argument.</summary>
+        <returns>a string representation of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Float#toString()" title="Reference documentation">Java documentation for <code>java.lang.Float.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Float#toString(float)" title="Reference documentation">Java documentation for <code>java.lang.Float.toString(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1971,15 +1972,16 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="f">a float value.</param>
-        <summary>Returns a <c>Float</c> instance representing the specified
-            <c>float</c> value.</summary>
-        <returns>a <c>Float</c> instance representing <c>f</c>.</returns>
+        <param name="s">the string to be parsed.</param>
+        <summary>Returns a <c>Float</c> object holding the
+            <c>float</c> value represented by the argument string
+            <c>s</c>.</summary>
+        <returns>a <c>Float</c> object holding the value
+                     represented by the <c>String</c> argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Float#valueOf(float)" title="Reference documentation">Java documentation for <code>java.lang.Float.valueOf(float)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Float#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Float.valueOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IAppendable.xml b/docs/Mono.Android/en/Java.Lang/IAppendable.xml
index c30855a0d1..7d544153b1 100644
--- a/docs/Mono.Android/en/Java.Lang/IAppendable.xml
+++ b/docs/Mono.Android/en/Java.Lang/IAppendable.xml
@@ -64,14 +64,15 @@
         <Parameter Name="csq" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="csq">the character sequence to append.</param>
-        <param name="c">The character to append</param>
-        <summary>Appends the specified character to this <c>Appendable</c>.</summary>
+        <param name="csq">The character sequence to append.  If <c>csq</c> is
+                    <c>null</c>, then the four characters <c>"null"</c> are
+                    appended to this Appendable.</param>
+        <summary>Appends the specified character sequence to this <c>Appendable</c>.</summary>
         <returns>A reference to this <c>Appendable</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Appendable#append(char)" title="Reference documentation">Java documentation for <code>java.lang.Appendable.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Appendable#append(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.Appendable.append(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,18 +154,20 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="csq">the character sequence to append.</param>
-        <param name="start">the first index of the subsequence of <c>csq</c> that is
-            appended.</param>
-        <param name="end">the last index of the subsequence of <c>csq</c> that is
-            appended.</param>
-        <param name="c">The character to append</param>
-        <summary>Appends the specified character to this <c>Appendable</c>.</summary>
+        <param name="csq">The character sequence from which a subsequence will be
+                    appended.  If <c>csq</c> is <c>null</c>, then characters
+                    will be appended as if <c>csq</c> contained the four
+                    characters <c>"null"</c>.</param>
+        <param name="start">The index of the first character in the subsequence</param>
+        <param name="end">The index of the character following the last character in the
+                    subsequence</param>
+        <summary>Appends a subsequence of the specified character sequence to this
+            <c>Appendable</c>.</summary>
         <returns>A reference to this <c>Appendable</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Appendable#append(char)" title="Reference documentation">Java documentation for <code>java.lang.Appendable.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Appendable#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Appendable.append(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml b/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml
index 480de481da..4a0e5c2fbc 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalAccessError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IllegalAccessError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;IllegalAccessError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalAccessError#IllegalAccessError()" title="Reference documentation">Java documentation for <code>java.lang.IllegalAccessError.IllegalAccessError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalAccessError#IllegalAccessError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IllegalAccessError.IllegalAccessError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml b/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml
index 961532453e..f138879e46 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalAccessException.xml
@@ -92,13 +92,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IllegalAccessException&lt;/code&gt; without a
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;IllegalAccessException&lt;/code&gt; with a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalAccessException#IllegalAccessException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalAccessException.IllegalAccessException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalAccessException#IllegalAccessException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IllegalAccessException.IllegalAccessException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml b/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml
index 33a97a1c54..6591ba0880 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalArgumentException.xml
@@ -89,13 +89,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IllegalArgumentException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalArgumentException#IllegalArgumentException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalArgumentException.IllegalArgumentException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalArgumentException#IllegalArgumentException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.IllegalArgumentException.IllegalArgumentException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +131,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IllegalArgumentException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;IllegalArgumentException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalArgumentException#IllegalArgumentException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalArgumentException.IllegalArgumentException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalArgumentException#IllegalArgumentException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IllegalArgumentException.IllegalArgumentException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,14 +193,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IllegalArgumentException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>Throwable#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value
+                    is permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalArgumentException#IllegalArgumentException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalArgumentException.IllegalArgumentException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalArgumentException#IllegalArgumentException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.IllegalArgumentException.IllegalArgumentException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml b/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml
index 054172dcc2..e1627fdc2d 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalMonitorStateException.xml
@@ -90,13 +90,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IllegalMonitorStateException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;IllegalMonitorStateException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalMonitorStateException#IllegalMonitorStateException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalMonitorStateException.IllegalMonitorStateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalMonitorStateException#IllegalMonitorStateException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IllegalMonitorStateException.IllegalMonitorStateException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalStateException.xml b/docs/Mono.Android/en/Java.Lang/IllegalStateException.xml
index 431040e126..f1ed58cdf7 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalStateException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalStateException.xml
@@ -88,12 +88,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an IllegalStateException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalStateException#IllegalStateException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalStateException.IllegalStateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalStateException#IllegalStateException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.IllegalStateException.IllegalStateException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +130,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an IllegalStateException with no detail message.</summary>
+        <param name="s">the String that contains a detailed message</param>
+        <summary>Constructs an IllegalStateException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalStateException#IllegalStateException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalStateException.IllegalStateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalStateException#IllegalStateException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IllegalStateException.IllegalStateException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +192,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an IllegalStateException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>Throwable#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value
+                    is permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalStateException#IllegalStateException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalStateException.IllegalStateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalStateException#IllegalStateException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.IllegalStateException.IllegalStateException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml b/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml
index ff19bccfb4..3fcd729827 100644
--- a/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IllegalThreadStateException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IllegalThreadStateException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;IllegalThreadStateException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IllegalThreadStateException#IllegalThreadStateException()" title="Reference documentation">Java documentation for <code>java.lang.IllegalThreadStateException.IllegalThreadStateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IllegalThreadStateException#IllegalThreadStateException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IllegalThreadStateException.IllegalThreadStateException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml b/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml
index d3dc953048..89d8881c9c 100644
--- a/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml
+++ b/docs/Mono.Android/en/Java.Lang/IncompatibleClassChangeError.xml
@@ -89,13 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IncompatibleClassChangeError&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;IncompatibleClassChangeError&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IncompatibleClassChangeError#IncompatibleClassChangeError()" title="Reference documentation">Java documentation for <code>java.lang.IncompatibleClassChangeError.IncompatibleClassChangeError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IncompatibleClassChangeError#IncompatibleClassChangeError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IncompatibleClassChangeError.IncompatibleClassChangeError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml b/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml
index 11108a2cdd..5083446641 100644
--- a/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml
+++ b/docs/Mono.Android/en/Java.Lang/IndexOutOfBoundsException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;IndexOutOfBoundsException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;IndexOutOfBoundsException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/IndexOutOfBoundsException#IndexOutOfBoundsException()" title="Reference documentation">Java documentation for <code>java.lang.IndexOutOfBoundsException.IndexOutOfBoundsException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/IndexOutOfBoundsException#IndexOutOfBoundsException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.IndexOutOfBoundsException.IndexOutOfBoundsException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/InstantiationError.xml b/docs/Mono.Android/en/Java.Lang/InstantiationError.xml
index db9664ef11..0c126fc504 100644
--- a/docs/Mono.Android/en/Java.Lang/InstantiationError.xml
+++ b/docs/Mono.Android/en/Java.Lang/InstantiationError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;InstantiationError&lt;/code&gt; with no detail  message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;InstantiationError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/InstantiationError#InstantiationError()" title="Reference documentation">Java documentation for <code>java.lang.InstantiationError.InstantiationError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/InstantiationError#InstantiationError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.InstantiationError.InstantiationError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/InstantiationException.xml b/docs/Mono.Android/en/Java.Lang/InstantiationException.xml
index 6ee61189f9..4af155e2d7 100644
--- a/docs/Mono.Android/en/Java.Lang/InstantiationException.xml
+++ b/docs/Mono.Android/en/Java.Lang/InstantiationException.xml
@@ -90,12 +90,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an <c>InstantiationException</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an <c>InstantiationException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/InstantiationException#InstantiationException()" title="Reference documentation">Java documentation for <code>java.lang.InstantiationException.InstantiationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/InstantiationException#InstantiationException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.InstantiationException.InstantiationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Integer.xml b/docs/Mono.Android/en/Java.Lang/Integer.xml
index 7860d2dc44..bc900d97b2 100644
--- a/docs/Mono.Android/en/Java.Lang/Integer.xml
+++ b/docs/Mono.Android/en/Java.Lang/Integer.xml
@@ -110,15 +110,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="value">the value to be represented by the
-                             <c>Integer</c> object.</param>
+        <param name="s">the <c>String</c> to be converted to an
+                            <c>Integer</c>.</param>
         <summary>Constructs a newly allocated <c>Integer</c> object that
-            represents the specified <c>int</c> value.</summary>
+            represents the <c>int</c> value indicated by the
+            <c>String</c> parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#Integer(int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.Integer(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#Integer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Integer.Integer(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -583,15 +583,15 @@
         <Parameter Name="val" Type="Java.Lang.Integer" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
         <param name="nm">property name.</param>
-        <summary>Determines the integer value of the system property with the
+        <param name="val">default value.</param>
+        <summary>Returns the integer value of the system property with the
             specified name.</summary>
         <returns>the <c>Integer</c> value of the property.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#getInteger(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Integer.getInteger(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#getInteger(java.lang.String,%20java.lang.Integer)" title="Reference documentation">Java documentation for <code>java.lang.Integer.getInteger(java.lang.String, java.lang.Integer)</code>.</a>
             </format>
           </para>
           <para>
@@ -627,15 +627,15 @@
         <Parameter Name="val" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
         <param name="nm">property name.</param>
+        <param name="val">default value.</param>
         <summary>Determines the integer value of the system property with the
             specified name.</summary>
         <returns>the <c>Integer</c> value of the property.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#getInteger(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Integer.getInteger(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#getInteger(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.getInteger(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -670,15 +670,14 @@
         <Parameter Name="value" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Integer</c>.</summary>
-        <returns>a hash code value for this object, equal to the
-                     primitive <c>int</c> value represented by this
-                     <c>Integer</c> object.</returns>
+        <param name="value">the value to hash</param>
+        <summary>Returns a hash code for a <c>int</c> value; compatible with
+            <c>Integer.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>int</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Integer.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#hashCode(int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.hashCode(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1266,15 +1265,17 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix to use when parsing.</param>
-        <param name="s">a <c>String</c> containing the <c>int</c>
-                        representation to be parsed</param>
-        <summary>Parses the string argument as a signed decimal integer.</summary>
-        <returns>the integer value represented by the argument in decimal.</returns>
+        <param name="s">the <c>String</c> containing the integer
+                             representation to be parsed</param>
+        <param name="radix">the radix to be used while parsing <c>s</c>.</param>
+        <summary>Parses the string argument as a signed integer in the radix
+            specified by the second argument.</summary>
+        <returns>the integer represented by the string argument in the
+                        specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#parseInt(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Integer.parseInt(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#parseInt(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.parseInt(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1354,15 +1355,17 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">To be added.</param>
-        <param name="s">a <c>String</c> containing the unsigned <c>int</c>
-                       representation to be parsed</param>
-        <summary>Parses the string argument as an unsigned decimal integer.</summary>
-        <returns>the unsigned integer value represented by the argument in decimal.</returns>
+        <param name="s">the <c>String</c> containing the unsigned integer
+                             representation to be parsed</param>
+        <param name="radix">the radix to be used while parsing <c>s</c>.</param>
+        <summary>Parses the string argument as an unsigned integer in the radix
+            specified by the second argument.</summary>
+        <returns>the integer represented by the string argument in the
+                        specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#parseUnsignedInt(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Integer.parseUnsignedInt(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#parseUnsignedInt(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.parseUnsignedInt(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2409,15 +2412,14 @@
         <Parameter Name="i" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">the integer to convert.</param>
-        <summary>Returns a <c>String</c> object representing this
-            <c>Integer</c>'s value.</summary>
-        <returns>a string representation of the value of this object in
-                     base&amp;nbsp;10.</returns>
+        <param name="i">an integer to be converted.</param>
+        <summary>Returns a <c>String</c> object representing the
+            specified integer.</summary>
+        <returns>a string representation of the argument in base&amp;nbsp;10.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#toString()" title="Reference documentation">Java documentation for <code>java.lang.Integer.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#toString(int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.toString(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2453,16 +2455,15 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">the signed integer to convert.</param>
-        <param name="radix">the base to use for the conversion.</param>
-        <summary>Returns a <c>String</c> object representing this
-            <c>Integer</c>'s value.</summary>
-        <returns>a string representation of the value of this object in
-                     base&amp;nbsp;10.</returns>
+        <param name="i">an integer to be converted to a string.</param>
+        <param name="radix">the radix to use in the string representation.</param>
+        <summary>Returns a string representation of the first argument in the
+            radix specified by the second argument.</summary>
+        <returns>a string representation of the argument in the specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#toString()" title="Reference documentation">Java documentation for <code>java.lang.Integer.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#toString(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.toString(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2581,15 +2582,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">To be added.</param>
         <param name="i">an integer to be converted to an unsigned string.</param>
-        <summary>Returns a string representation of the argument as an unsigned
-            decimal value.</summary>
-        <returns>an unsigned string representation of the argument.</returns>
+        <param name="radix">the radix to use in the string representation.</param>
+        <summary>Returns a string representation of the first argument as an
+            unsigned integer value in the radix specified by the second
+            argument.</summary>
+        <returns>an unsigned string representation of the argument in the specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#toUnsignedString(int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.toUnsignedString(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#toUnsignedString(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.toUnsignedString(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2703,15 +2705,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="i">an <c>int</c> value.</param>
-        <summary>Returns an <c>Integer</c> instance representing the specified
-            <c>int</c> value.</summary>
-        <returns>an <c>Integer</c> instance representing <c>i</c>.</returns>
+        <param name="s">the string to be parsed.</param>
+        <summary>Returns an <c>Integer</c> object holding the
+            value of the specified <c>String</c>.</summary>
+        <returns>an <c>Integer</c> object holding the value
+                        represented by the string argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#valueOf(int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.valueOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Integer.valueOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2749,16 +2751,18 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="radix">the radix to use when parsing.</param>
-        <param name="i">an <c>int</c> value.</param>
-        <summary>Returns an <c>Integer</c> instance representing the specified
-            <c>int</c> value.</summary>
-        <returns>an <c>Integer</c> instance representing <c>i</c>.</returns>
+        <param name="s">the string to be parsed.</param>
+        <param name="radix">the radix to be used in interpreting <c>s</c></param>
+        <summary>Returns an <c>Integer</c> object holding the value
+            extracted from the specified <c>String</c> when parsed
+            with the radix given by the second argument.</summary>
+        <returns>an <c>Integer</c> object holding the value
+                        represented by the string argument in the specified
+                        radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Integer#valueOf(int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.valueOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Integer#valueOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Integer.valueOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/InternalError.xml b/docs/Mono.Android/en/Java.Lang/InternalError.xml
index e1a0406886..351df41b3e 100644
--- a/docs/Mono.Android/en/Java.Lang/InternalError.xml
+++ b/docs/Mono.Android/en/Java.Lang/InternalError.xml
@@ -88,12 +88,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an &lt;code&gt;InternalError&lt;/code&gt; with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs an <c>InternalError</c> with the specified cause
+            and a detail message of <c>(cause==null ? null :
+            cause.toString())</c> (which typically contains the class and
+            detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/InternalError#InternalError()" title="Reference documentation">Java documentation for <code>java.lang.InternalError.InternalError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/InternalError#InternalError(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.InternalError.InternalError(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +130,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs an &lt;code&gt;InternalError&lt;/code&gt; with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;InternalError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/InternalError#InternalError()" title="Reference documentation">Java documentation for <code>java.lang.InternalError.InternalError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/InternalError#InternalError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.InternalError.InternalError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +192,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an &lt;code&gt;InternalError&lt;/code&gt; with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs an <c>InternalError</c> with the specified detail
+            message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/InternalError#InternalError()" title="Reference documentation">Java documentation for <code>java.lang.InternalError.InternalError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/InternalError#InternalError(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.InternalError.InternalError(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/InterruptedException.xml b/docs/Mono.Android/en/Java.Lang/InterruptedException.xml
index 21af0dcb28..5c02f79284 100644
--- a/docs/Mono.Android/en/Java.Lang/InterruptedException.xml
+++ b/docs/Mono.Android/en/Java.Lang/InterruptedException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;InterruptedException&lt;/code&gt; with no detail  message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;InterruptedException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/InterruptedException#InterruptedException()" title="Reference documentation">Java documentation for <code>java.lang.InterruptedException.InterruptedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/InterruptedException#InterruptedException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.InterruptedException.InterruptedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/JavaSystem.xml b/docs/Mono.Android/en/Java.Lang/JavaSystem.xml
index ba619c09eb..6f93ff2bba 100644
--- a/docs/Mono.Android/en/Java.Lang/JavaSystem.xml
+++ b/docs/Mono.Android/en/Java.Lang/JavaSystem.xml
@@ -382,13 +382,14 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">the name of the environment variable.</param>
-        <summary>Returns an unmodifiable string map view of the current system environment.</summary>
-        <returns>the environment as a map of variable names to values</returns>
+        <param name="name">the name of the environment variable</param>
+        <summary>Gets the value of the specified environment variable.</summary>
+        <returns>the string value of the variable, or &lt;code&gt;null&lt;/code&gt;
+                    if the variable is not defined in the system environment</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/System#getenv()" title="Reference documentation">Java documentation for <code>java.lang.System.getenv()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/System#getenv(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.System.getenv(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -466,15 +467,15 @@
         <Parameter Name="def" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="def">To be added.</param>
         <param name="key">the name of the system property.</param>
+        <param name="def">a default value.</param>
         <summary>Gets the system property indicated by the specified key.</summary>
         <returns>the string value of the system property,
-                        or &lt;code&gt;null&lt;/code&gt; if there is no property with that key.</returns>
+                        or the default value if there is no property with that key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/System#getProperty(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.System.getProperty(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/System#getProperty(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.System.getProperty(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/LinkageError.xml b/docs/Mono.Android/en/Java.Lang/LinkageError.xml
index d7402c37c1..31c4518113 100644
--- a/docs/Mono.Android/en/Java.Lang/LinkageError.xml
+++ b/docs/Mono.Android/en/Java.Lang/LinkageError.xml
@@ -89,12 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a <c>LinkageError</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a <c>LinkageError</c> with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/LinkageError#LinkageError()" title="Reference documentation">Java documentation for <code>java.lang.LinkageError.LinkageError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/LinkageError#LinkageError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.LinkageError.LinkageError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -150,13 +151,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>LinkageError</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <param name="cause">the cause, may be <c>null</c></param>
+        <summary>Constructs a <c>LinkageError</c> with the specified detail
+            message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/LinkageError#LinkageError()" title="Reference documentation">Java documentation for <code>java.lang.LinkageError.LinkageError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/LinkageError#LinkageError(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.LinkageError.LinkageError(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Long.xml b/docs/Mono.Android/en/Java.Lang/Long.xml
index df38164bb0..49b1af974b 100644
--- a/docs/Mono.Android/en/Java.Lang/Long.xml
+++ b/docs/Mono.Android/en/Java.Lang/Long.xml
@@ -109,15 +109,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="value">the value to be represented by the
-                     <c>Long</c> object.</param>
+        <param name="s">the <c>String</c> to be converted to a
+                        <c>Long</c>.</param>
         <summary>Constructs a newly allocated <c>Long</c> object that
-            represents the specified <c>long</c> argument.</summary>
+            represents the <c>long</c> value indicated by the
+            <c>String</c> parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#Long(long)" title="Reference documentation">Java documentation for <code>java.lang.Long.Long(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#Long(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Long.Long(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -582,15 +582,15 @@
         <Parameter Name="val" Type="Java.Lang.Long" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
         <param name="nm">property name.</param>
-        <summary>Determines the <c>long</c> value of the system property
-            with the specified name.</summary>
+        <param name="val">default value.</param>
+        <summary>Returns the <c>long</c> value of the system property with
+            the specified name.</summary>
         <returns>the <c>Long</c> value of the property.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#getLong(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Long.getLong(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#getLong(java.lang.String,%20java.lang.Long)" title="Reference documentation">Java documentation for <code>java.lang.Long.getLong(java.lang.String, java.lang.Long)</code>.</a>
             </format>
           </para>
           <para>
@@ -626,15 +626,15 @@
         <Parameter Name="val" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
         <param name="nm">property name.</param>
+        <param name="val">default value.</param>
         <summary>Determines the <c>long</c> value of the system property
             with the specified name.</summary>
         <returns>the <c>Long</c> value of the property.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#getLong(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Long.getLong(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#getLong(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Long.getLong(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -669,13 +669,14 @@
         <Parameter Name="value" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Long</c>.</summary>
-        <returns>a hash code value for this object.</returns>
+        <param name="value">the value to hash</param>
+        <summary>Returns a hash code for a <c>long</c> value; compatible with
+            <c>Long.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>long</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Long.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#hashCode(long)" title="Reference documentation">Java documentation for <code>java.lang.Long.hashCode(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1264,16 +1265,17 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix to use when parsing.</param>
-        <param name="s">a <c>String</c> containing the <c>long</c>
-                        representation to be parsed</param>
-        <summary>Parses the string argument as a signed decimal <c>long</c>.</summary>
-        <returns>the <c>long</c> represented by the argument in
-                        decimal.</returns>
+        <param name="s">the <c>String</c> containing the
+                                <c>long</c> representation to be parsed.</param>
+        <param name="radix">the radix to be used while parsing <c>s</c>.</param>
+        <summary>Parses the string argument as a signed <c>long</c> in the
+            radix specified by the second argument.</summary>
+        <returns>the <c>long</c> represented by the string argument in
+                        the specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#parseLong(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Long.parseLong(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#parseLong(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Long.parseLong(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1353,15 +1355,17 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">To be added.</param>
-        <param name="s">a <c>String</c> containing the unsigned <c>long</c>
-                       representation to be parsed</param>
-        <summary>Parses the string argument as an unsigned decimal <c>long</c>.</summary>
-        <returns>the unsigned <c>long</c> value represented by the decimal string argument</returns>
+        <param name="s">the <c>String</c> containing the unsigned integer
+                             representation to be parsed</param>
+        <param name="radix">the radix to be used while parsing <c>s</c>.</param>
+        <summary>Parses the string argument as an unsigned <c>long</c> in the
+            radix specified by the second argument.</summary>
+        <returns>the unsigned <c>long</c> represented by the string
+                        argument in the specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#parseUnsignedLong(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Long.parseUnsignedLong(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#parseUnsignedLong(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Long.parseUnsignedLong(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2409,15 +2413,14 @@
         <Parameter Name="i" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="i">To be added.</param>
-        <summary>Returns a <c>String</c> object representing this
-            <c>Long</c>'s value.</summary>
-        <returns>a string representation of the value of this object in
-                     base&amp;nbsp;10.</returns>
+        <param name="i">a <c>long</c> to be converted.</param>
+        <summary>Returns a <c>String</c> object representing the specified
+            <c>long</c>.</summary>
+        <returns>a string representation of the argument in base&amp;nbsp;10.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#toString()" title="Reference documentation">Java documentation for <code>java.lang.Long.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#toString(long)" title="Reference documentation">Java documentation for <code>java.lang.Long.toString(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2453,16 +2456,15 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">To be added.</param>
-        <param name="radix">the base to use for the conversion.</param>
-        <summary>Returns a <c>String</c> object representing this
-            <c>Long</c>'s value.</summary>
-        <returns>a string representation of the value of this object in
-                     base&amp;nbsp;10.</returns>
+        <param name="i">a <c>long</c> to be converted to a string.</param>
+        <param name="radix">the radix to use in the string representation.</param>
+        <summary>Returns a string representation of the first argument in the
+            radix specified by the second argument.</summary>
+        <returns>a string representation of the argument in the specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#toString()" title="Reference documentation">Java documentation for <code>java.lang.Long.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#toString(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Long.toString(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2539,15 +2541,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">To be added.</param>
         <param name="i">an integer to be converted to an unsigned string.</param>
-        <summary>Returns a string representation of the argument as an unsigned
-            decimal value.</summary>
-        <returns>an unsigned string representation of the argument.</returns>
+        <param name="radix">the radix to use in the string representation.</param>
+        <summary>Returns a string representation of the first argument as an
+            unsigned integer value in the radix specified by the second
+            argument.</summary>
+        <returns>an unsigned string representation of the argument in the specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#toUnsignedString(long)" title="Reference documentation">Java documentation for <code>java.lang.Long.toUnsignedString(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#toUnsignedString(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Long.toUnsignedString(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2661,15 +2664,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="l">a long value.</param>
-        <summary>Returns a <c>Long</c> instance representing the specified
-            <c>long</c> value.</summary>
-        <returns>a <c>Long</c> instance representing <c>l</c>.</returns>
+        <param name="s">the string to be parsed.</param>
+        <summary>Returns a <c>Long</c> object holding the value
+            of the specified <c>String</c>.</summary>
+        <returns>a <c>Long</c> object holding the value
+                        represented by the string argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#valueOf(long)" title="Reference documentation">Java documentation for <code>java.lang.Long.valueOf(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Long.valueOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2707,16 +2710,18 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="radix">the radix to use when parsing.</param>
-        <param name="l">a long value.</param>
-        <summary>Returns a <c>Long</c> instance representing the specified
-            <c>long</c> value.</summary>
-        <returns>a <c>Long</c> instance representing <c>l</c>.</returns>
+        <param name="s">the string to be parsed</param>
+        <param name="radix">the radix to be used in interpreting <c>s</c></param>
+        <summary>Returns a <c>Long</c> object holding the value
+            extracted from the specified <c>String</c> when parsed
+            with the radix given by the second argument.</summary>
+        <returns>a <c>Long</c> object holding the value
+                        represented by the string argument in the specified
+                        radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Long#valueOf(long)" title="Reference documentation">Java documentation for <code>java.lang.Long.valueOf(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Long#valueOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Long.valueOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Math.xml b/docs/Mono.Android/en/Java.Lang/Math.xml
index 4da8a73e26..0bf19491cd 100644
--- a/docs/Mono.Android/en/Java.Lang/Math.xml
+++ b/docs/Mono.Android/en/Java.Lang/Math.xml
@@ -101,12 +101,12 @@
       </Parameters>
       <Docs>
         <param name="a">the argument whose absolute value is to be determined</param>
-        <summary>Returns the absolute value of a <c>double</c> value.</summary>
+        <summary>Returns the absolute value of an <c>int</c> value.</summary>
         <returns>the absolute value of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#abs(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.abs(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#abs(int)" title="Reference documentation">Java documentation for <code>java.lang.Math.abs(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -142,12 +142,12 @@
       </Parameters>
       <Docs>
         <param name="a">the argument whose absolute value is to be determined</param>
-        <summary>Returns the absolute value of a <c>double</c> value.</summary>
+        <summary>Returns the absolute value of a <c>long</c> value.</summary>
         <returns>the absolute value of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#abs(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.abs(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#abs(long)" title="Reference documentation">Java documentation for <code>java.lang.Math.abs(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -183,12 +183,12 @@
       </Parameters>
       <Docs>
         <param name="a">the argument whose absolute value is to be determined</param>
-        <summary>Returns the absolute value of a <c>double</c> value.</summary>
+        <summary>Returns the absolute value of a <c>float</c> value.</summary>
         <returns>the absolute value of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#abs(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.abs(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#abs(float)" title="Reference documentation">Java documentation for <code>java.lang.Math.abs(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -312,12 +312,12 @@
         <param name="x">the first value</param>
         <param name="y">the second value</param>
         <summary>Returns the sum of its arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+            throwing an exception if the result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#addExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.addExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#addExact(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Math.addExact(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -624,7 +624,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#copySign(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.copySign(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#copySign(float,%20float)" title="Reference documentation">Java documentation for <code>java.lang.Math.copySign(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -784,12 +784,12 @@
       <Docs>
         <param name="a">the value to decrement</param>
         <summary>Returns the argument decremented by one, throwing an exception if the
-            result overflows an <c>int</c>.</summary>
+            result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#decrementExact(int)" title="Reference documentation">Java documentation for <code>java.lang.Math.decrementExact(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#decrementExact(long)" title="Reference documentation">Java documentation for <code>java.lang.Math.decrementExact(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1039,13 +1039,13 @@
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
         <summary>Returns the largest (closest to positive infinity)
-            <c>int</c> value that is less than or equal to the algebraic quotient.</summary>
+            <c>long</c> value that is less than or equal to the algebraic quotient.</summary>
         <returns>the largest (closest to positive infinity)
             <c>int</c> value that is less than or equal to the algebraic quotient.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#floorDiv(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorDiv(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#floorDiv(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorDiv(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1083,13 +1083,13 @@
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
         <summary>Returns the largest (closest to positive infinity)
-            <c>int</c> value that is less than or equal to the algebraic quotient.</summary>
+            <c>long</c> value that is less than or equal to the algebraic quotient.</summary>
         <returns>the largest (closest to positive infinity)
-            <c>int</c> value that is less than or equal to the algebraic quotient.</returns>
+            <c>long</c> value that is less than or equal to the algebraic quotient.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#floorDiv(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorDiv(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#floorDiv(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorDiv(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1168,12 +1168,12 @@
       <Docs>
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
-        <summary>Returns the floor modulus of the <c>int</c> arguments.</summary>
+        <summary>Returns the floor modulus of the <c>long</c> and <c>int</c> arguments.</summary>
         <returns>the floor modulus <c>x - (floorDiv(x, y) * y)</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#floorMod(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorMod(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#floorMod(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorMod(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1210,12 +1210,12 @@
       <Docs>
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
-        <summary>Returns the floor modulus of the <c>int</c> arguments.</summary>
+        <summary>Returns the floor modulus of the <c>long</c> arguments.</summary>
         <returns>the floor modulus <c>x - (floorDiv(x, y) * y)</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#floorMod(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorMod(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#floorMod(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Math.floorMod(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1291,15 +1291,14 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">a <c>double</c> value</param>
+        <param name="f">a <c>float</c> value</param>
         <summary>Returns the unbiased exponent used in the representation of a
-            <c>double</c>.</summary>
+            <c>float</c>.</summary>
         <returns>the unbiased exponent of the argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#getExponent(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.getExponent(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#getExponent(float)" title="Reference documentation">Java documentation for <code>java.lang.Math.getExponent(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1467,12 +1466,12 @@
       <Docs>
         <param name="a">the value to increment</param>
         <summary>Returns the argument incremented by one, throwing an exception if the
-            result overflows an <c>int</c>.</summary>
+            result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#incrementExact(int)" title="Reference documentation">Java documentation for <code>java.lang.Math.incrementExact(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#incrementExact(long)" title="Reference documentation">Java documentation for <code>java.lang.Math.incrementExact(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1709,12 +1708,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the greater of two <c>double</c> values.</summary>
+        <summary>Returns the greater of two <c>int</c> values.</summary>
         <returns>the larger of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#max(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.max(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#max(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.max(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1752,12 +1751,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the greater of two <c>double</c> values.</summary>
+        <summary>Returns the greater of two <c>long</c> values.</summary>
         <returns>the larger of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#max(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.max(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#max(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Math.max(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1795,12 +1794,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the greater of two <c>double</c> values.</summary>
+        <summary>Returns the greater of two <c>float</c> values.</summary>
         <returns>the larger of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#max(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.max(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#max(float,%20float)" title="Reference documentation">Java documentation for <code>java.lang.Math.max(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1881,12 +1880,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the smaller of two <c>double</c> values.</summary>
+        <summary>Returns the smaller of two <c>int</c> values.</summary>
         <returns>the smaller of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#min(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.min(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#min(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.min(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1924,12 +1923,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the smaller of two <c>double</c> values.</summary>
+        <summary>Returns the smaller of two <c>long</c> values.</summary>
         <returns>the smaller of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#min(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.min(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#min(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Math.min(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1967,12 +1966,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the smaller of two <c>double</c> values.</summary>
+        <summary>Returns the smaller of two <c>float</c> values.</summary>
         <returns>the smaller of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#min(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.min(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#min(float,%20float)" title="Reference documentation">Java documentation for <code>java.lang.Math.min(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2053,13 +2052,13 @@
       <Docs>
         <param name="x">the first value</param>
         <param name="y">the second value</param>
-        <summary>Returns the product of the arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+        <summary>Returns the product of the arguments, throwing an exception if the result
+            overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#multiplyExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.multiplyExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#multiplyExact(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.multiplyExact(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2097,12 +2096,12 @@
         <param name="x">the first value</param>
         <param name="y">the second value</param>
         <summary>Returns the product of the arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+            throwing an exception if the result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#multiplyExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.multiplyExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#multiplyExact(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Math.multiplyExact(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2264,12 +2263,12 @@
       <Docs>
         <param name="a">the value to negate</param>
         <summary>Returns the negation of the argument, throwing an exception if the
-            result overflows an <c>int</c>.</summary>
+            result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#negateExact(int)" title="Reference documentation">Java documentation for <code>java.lang.Math.negateExact(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#negateExact(long)" title="Reference documentation">Java documentation for <code>java.lang.Math.negateExact(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2362,7 +2361,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#nextAfter(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.nextAfter(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#nextAfter(float,%20double)" title="Reference documentation">Java documentation for <code>java.lang.Math.nextAfter(float, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -2439,16 +2438,15 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">starting floating-point value</param>
-        <summary>Returns the floating-point value adjacent to <c>d</c> in
+        <param name="f">starting floating-point value</param>
+        <summary>Returns the floating-point value adjacent to <c>f</c> in
             the direction of negative infinity.</summary>
         <returns>The adjacent floating-point value closer to negative
             infinity.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#nextDown(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.nextDown(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#nextDown(float)" title="Reference documentation">Java documentation for <code>java.lang.Math.nextDown(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2525,16 +2523,15 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">starting floating-point value</param>
-        <summary>Returns the floating-point value adjacent to <c>d</c> in
+        <param name="f">starting floating-point value</param>
+        <summary>Returns the floating-point value adjacent to <c>f</c> in
             the direction of positive infinity.</summary>
         <returns>The adjacent floating-point value closer to positive
             infinity.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#nextUp(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.nextUp(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#nextUp(float)" title="Reference documentation">Java documentation for <code>java.lang.Math.nextUp(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2779,16 +2776,15 @@
         <Parameter Name="a" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="a">a floating-point value to be rounded to a
-                     <c>long</c>.</param>
-        <summary>Returns the closest <c>long</c> to the argument, with ties
+        <param name="a">a floating-point value to be rounded to an integer.</param>
+        <summary>Returns the closest <c>int</c> to the argument, with ties
             rounding to positive infinity.</summary>
         <returns>the value of the argument rounded to the nearest
-                     <c>long</c> value.</returns>
+                     <c>int</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#round(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.round(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#round(float)" title="Reference documentation">Java documentation for <code>java.lang.Math.round(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2871,19 +2867,18 @@
         <Parameter Name="scaleFactor" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">number to be scaled by a power of two.</param>
-        <param name="scaleFactor">power of 2 used to scale <c>d</c></param>
-        <summary>Returns <c>d</c> &amp;times;
+        <param name="f">number to be scaled by a power of two.</param>
+        <param name="scaleFactor">power of 2 used to scale <c>f</c></param>
+        <summary>Returns <c>f</c> &amp;times;
             2&lt;sup&gt;<c>scaleFactor</c>&lt;/sup&gt; rounded as if performed
             by a single correctly rounded floating-point multiply to a
-            member of the double value set.</summary>
+            member of the float value set.</summary>
         <returns>
-          <c>d</c> &amp;times; 2&lt;sup&gt;<c>scaleFactor</c>&lt;/sup&gt;</returns>
+          <c>f</c> &amp;times; 2&lt;sup&gt;<c>scaleFactor</c>&lt;/sup&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#scalb(double,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.scalb(double, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#scalb(float,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.scalb(float, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2960,15 +2955,14 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">the value whose signum has to be computed.</param>
-        <param name="d">the floating-point value whose signum is to be returned</param>
+        <param name="f">the floating-point value whose signum is to be returned</param>
         <summary>Returns the signum function of the argument; zero if the argument
             is zero, 1.</summary>
         <returns>the signum function of the argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#signum(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.signum(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#signum(float)" title="Reference documentation">Java documentation for <code>java.lang.Math.signum(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -3175,12 +3169,12 @@
         <param name="x">the first value</param>
         <param name="y">the second value to subtract from the first</param>
         <summary>Returns the difference of the arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+            throwing an exception if the result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#subtractExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Math.subtractExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#subtractExact(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Math.subtractExact(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3526,14 +3520,13 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">the floating-point value to compute ulp of.</param>
-        <param name="d">the floating-point value whose ulp is to be returned</param>
+        <param name="f">the floating-point value whose ulp is to be returned</param>
         <summary>Returns the size of an ulp of the argument.</summary>
         <returns>the size of an ulp of the argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Math#ulp(double)" title="Reference documentation">Java documentation for <code>java.lang.Math.ulp(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Math#ulp(float)" title="Reference documentation">Java documentation for <code>java.lang.Math.ulp(float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml b/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml
index 119f40051f..56a647520f 100644
--- a/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NegativeArraySizeException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;NegativeArraySizeException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;NegativeArraySizeException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NegativeArraySizeException#NegativeArraySizeException()" title="Reference documentation">Java documentation for <code>java.lang.NegativeArraySizeException.NegativeArraySizeException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NegativeArraySizeException#NegativeArraySizeException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NegativeArraySizeException.NegativeArraySizeException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml b/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml
index ed78dc213e..ba2dffb478 100644
--- a/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoClassDefFoundError.xml
@@ -90,12 +90,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;NoClassDefFoundError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;NoClassDefFoundError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NoClassDefFoundError#NoClassDefFoundError()" title="Reference documentation">Java documentation for <code>java.lang.NoClassDefFoundError.NoClassDefFoundError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NoClassDefFoundError#NoClassDefFoundError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NoClassDefFoundError.NoClassDefFoundError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml b/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml
index f02e6fc6c5..b4631f9236 100644
--- a/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoSuchFieldError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchFieldError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;NoSuchFieldError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NoSuchFieldError#NoSuchFieldError()" title="Reference documentation">Java documentation for <code>java.lang.NoSuchFieldError.NoSuchFieldError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NoSuchFieldError#NoSuchFieldError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NoSuchFieldError.NoSuchFieldError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoSuchFieldException.xml b/docs/Mono.Android/en/Java.Lang/NoSuchFieldException.xml
index 0b2d48bcdd..2b8ef8e427 100644
--- a/docs/Mono.Android/en/Java.Lang/NoSuchFieldException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoSuchFieldException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructor.</summary>
+        <param name="s">the detail message</param>
+        <summary>Constructor with a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NoSuchFieldException#NoSuchFieldException()" title="Reference documentation">Java documentation for <code>java.lang.NoSuchFieldException.NoSuchFieldException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NoSuchFieldException#NoSuchFieldException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NoSuchFieldException.NoSuchFieldException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml b/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml
index 823a3322a3..b4913abec5 100644
--- a/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoSuchMethodError.xml
@@ -89,12 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchMethodError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;NoSuchMethodError&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NoSuchMethodError#NoSuchMethodError()" title="Reference documentation">Java documentation for <code>java.lang.NoSuchMethodError.NoSuchMethodError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NoSuchMethodError#NoSuchMethodError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NoSuchMethodError.NoSuchMethodError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml b/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml
index b1c18ef95d..16402a9875 100644
--- a/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NoSuchMethodException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchMethodException&lt;/code&gt; without a detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;NoSuchMethodException&lt;/code&gt; with a detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NoSuchMethodException#NoSuchMethodException()" title="Reference documentation">Java documentation for <code>java.lang.NoSuchMethodException.NoSuchMethodException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NoSuchMethodException#NoSuchMethodException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NoSuchMethodException.NoSuchMethodException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NullPointerException.xml b/docs/Mono.Android/en/Java.Lang/NullPointerException.xml
index e769c975f0..800ebb4137 100644
--- a/docs/Mono.Android/en/Java.Lang/NullPointerException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NullPointerException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a <c>NullPointerException</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a <c>NullPointerException</c> with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NullPointerException#NullPointerException()" title="Reference documentation">Java documentation for <code>java.lang.NullPointerException.NullPointerException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NullPointerException#NullPointerException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NullPointerException.NullPointerException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml b/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml
index 4fef79885a..f94ae612b9 100644
--- a/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml
+++ b/docs/Mono.Android/en/Java.Lang/NumberFormatException.xml
@@ -89,12 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;NumberFormatException&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;NumberFormatException&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/NumberFormatException#NumberFormatException()" title="Reference documentation">Java documentation for <code>java.lang.NumberFormatException.NumberFormatException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/NumberFormatException#NumberFormatException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.NumberFormatException.NumberFormatException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Object.xml b/docs/Mono.Android/en/Java.Lang/Object.xml
index d03616d6c6..6fc3a0247b 100644
--- a/docs/Mono.Android/en/Java.Lang/Object.xml
+++ b/docs/Mono.Android/en/Java.Lang/Object.xml
@@ -2250,14 +2250,15 @@
         <Parameter Name="timeout" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <summary>Causes the current thread to wait until another thread invokes the
+        <param name="timeout">the maximum time to wait in milliseconds.</param>
+        <summary>Causes the current thread to wait until either another thread invokes the
             <c>java.lang.Object#notify()</c> method or the
-            <c>java.lang.Object#notifyAll()</c> method for this object.</summary>
+            <c>java.lang.Object#notifyAll()</c> method for this object, or a
+            specified amount of time has elapsed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Object#wait()" title="Reference documentation">Java documentation for <code>java.lang.Object.wait()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Object#wait(long)" title="Reference documentation">Java documentation for <code>java.lang.Object.wait(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2304,16 +2305,18 @@
         <Parameter Name="nanos" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="nanos">the fraction of a millisecond to wait, specified in
-            nanoseconds.</param>
+        <param name="timeout">the maximum time to wait in milliseconds.</param>
+        <param name="nanos">additional time, in nanoseconds range
+                                  0-999999.</param>
         <summary>Causes the current thread to wait until another thread invokes the
             <c>java.lang.Object#notify()</c> method or the
-            <c>java.lang.Object#notifyAll()</c> method for this object.</summary>
+            <c>java.lang.Object#notifyAll()</c> method for this object, or
+            some other thread interrupts the current thread, or a certain
+            amount of real time has elapsed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Object#wait()" title="Reference documentation">Java documentation for <code>java.lang.Object.wait()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Object#wait(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Object.wait(long, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/OutOfMemoryError.xml b/docs/Mono.Android/en/Java.Lang/OutOfMemoryError.xml
index 42d2bd361a..61b4f4abf1 100644
--- a/docs/Mono.Android/en/Java.Lang/OutOfMemoryError.xml
+++ b/docs/Mono.Android/en/Java.Lang/OutOfMemoryError.xml
@@ -89,12 +89,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an <c>OutOfMemoryError</c> with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an <c>OutOfMemoryError</c> with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/OutOfMemoryError#OutOfMemoryError()" title="Reference documentation">Java documentation for <code>java.lang.OutOfMemoryError.OutOfMemoryError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/OutOfMemoryError#OutOfMemoryError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.OutOfMemoryError.OutOfMemoryError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Package.xml b/docs/Mono.Android/en/Java.Lang/Package.xml
index 9ffc7695c3..dc2407c3fb 100644
--- a/docs/Mono.Android/en/Java.Lang/Package.xml
+++ b/docs/Mono.Android/en/Java.Lang/Package.xml
@@ -365,15 +365,14 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="c">the class to get the package of.</param>
-        <summary>Get the package for the specified class.</summary>
-        <returns>the package of the class. It may be null if no package
+        <param name="name">a package name, for example, java.lang.</param>
+        <summary>Find a package by name in the callers <c>ClassLoader</c> instance.</summary>
+        <returns>the package of the requested name. It may be null if no package
                      information is available from the archive or codebase.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Package#getPackage(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.lang.Package.getPackage(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Package#getPackage(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Package.getPackage(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -562,13 +561,14 @@
         <Parameter Name="url" Type="Java.Net.URL" />
       </Parameters>
       <Docs>
-        <param name="url">the URL to check.</param>
-        <summary>Returns true if this package is sealed.</summary>
-        <returns>true if the package is sealed, false otherwise</returns>
+        <param name="url">the code source url</param>
+        <summary>Returns true if this package is sealed with respect to the specified
+            code source url.</summary>
+        <returns>true if this package is sealed with respect to url</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Package#isSealed()" title="Reference documentation">Java documentation for <code>java.lang.Package.isSealed()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Package#isSealed(java.net.URL)" title="Reference documentation">Java documentation for <code>java.lang.Package.isSealed(java.net.URL)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Process.xml b/docs/Mono.Android/en/Java.Lang/Process.xml
index 6d105f46eb..9200023be9 100644
--- a/docs/Mono.Android/en/Java.Lang/Process.xml
+++ b/docs/Mono.Android/en/Java.Lang/Process.xml
@@ -490,18 +490,18 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
+        <param name="timeout">the maximum time to wait</param>
+        <param name="unit">the time unit of the <c>timeout</c> argument</param>
         <summary>Causes the current thread to wait, if necessary, until the
-            process represented by this <c>Process</c> object has
-            terminated.</summary>
-        <returns>the exit value of the subprocess represented by this
-                    <c>Process</c> object.  By convention, the value
-                    <c>0</c> indicates normal termination.</returns>
+            subprocess represented by this <c>Process</c> object has
+            terminated, or the specified waiting time elapses.</summary>
+        <returns>
+          <c>true</c> if the subprocess has exited and <c>false</c> if
+                    the waiting time elapsed before the subprocess has exited.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Process#waitFor()" title="Reference documentation">Java documentation for <code>java.lang.Process.waitFor()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Process#waitFor(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.lang.Process.waitFor(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ProcessBuilder.xml b/docs/Mono.Android/en/Java.Lang/ProcessBuilder.xml
index e0d1260614..d4580b7969 100644
--- a/docs/Mono.Android/en/Java.Lang/ProcessBuilder.xml
+++ b/docs/Mono.Android/en/Java.Lang/ProcessBuilder.xml
@@ -54,13 +54,13 @@
         <Parameter Name="command" Type="System.Collections.Generic.IList&lt;System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="command">a string array containing the program and its arguments</param>
+        <param name="command">the list containing the program and its arguments</param>
         <summary>Constructs a process builder with the specified operating
             system program and arguments.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#ProcessBuilder(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.ProcessBuilder(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#ProcessBuilder(java.util.List)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.ProcessBuilder(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -177,14 +177,14 @@
         <Parameter Name="command" Type="System.Collections.Generic.IList&lt;System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="command">To be added.</param>
-        <summary>Returns this process builder's operating system program and
+        <param name="command">the list containing the program and its arguments</param>
+        <summary>Sets this process builder's operating system program and
             arguments.</summary>
-        <returns>this process builder's program and its arguments</returns>
+        <returns>this process builder</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#command()" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.command()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#command(java.util.List)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.command(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -304,13 +304,13 @@
         <Parameter Name="directory" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="directory">the new working directory for this process builder.</param>
-        <summary>Returns this process builder's working directory.</summary>
-        <returns>this process builder's working directory</returns>
+        <param name="directory">the new working directory</param>
+        <summary>Sets this process builder's working directory.</summary>
+        <returns>this process builder</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#directory()" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.directory()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#directory(java.io.File)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.directory(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -489,13 +489,13 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
-        <summary>Returns this process builder's standard error destination.</summary>
-        <returns>this process builder's standard error destination</returns>
+        <param name="file">the new standard error destination</param>
+        <summary>Sets this process builder's standard error destination to a file.</summary>
+        <returns>this process builder</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectError()" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectError(java.io.File)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectError(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -608,16 +608,13 @@
         <Parameter Name="redirectErrorStream" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="redirectErrorStream">
-          <c>true</c> to redirect standard error, <c>false</c>
-            otherwise.</param>
-        <summary>Tells whether this process builder merges standard error and
-            standard output.</summary>
-        <returns>this process builder's <c>redirectErrorStream</c> property</returns>
+        <param name="redirectErrorStream">the new property value</param>
+        <summary>Sets this process builder's <c>redirectErrorStream</c> property.</summary>
+        <returns>this process builder</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectErrorStream()" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectErrorStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectErrorStream(boolean)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectErrorStream(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -689,13 +686,13 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
-        <summary>Returns this process builder's standard input source.</summary>
-        <returns>this process builder's standard input source</returns>
+        <param name="file">the new standard input source</param>
+        <summary>Sets this process builder's standard input source to a file.</summary>
+        <returns>this process builder</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectInput()" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectInput()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectInput(java.io.File)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectInput(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -806,13 +803,13 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
-        <summary>Returns this process builder's standard output destination.</summary>
-        <returns>this process builder's standard output destination</returns>
+        <param name="file">the new standard output destination</param>
+        <summary>Sets this process builder's standard output destination to a file.</summary>
+        <returns>this process builder</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectOutput()" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectOutput()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ProcessBuilder#redirectOutput(java.io.File)" title="Reference documentation">Java documentation for <code>java.lang.ProcessBuilder.redirectOutput(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/ReflectiveOperationException.xml b/docs/Mono.Android/en/Java.Lang/ReflectiveOperationException.xml
index 74f6e93003..a888d02030 100644
--- a/docs/Mono.Android/en/Java.Lang/ReflectiveOperationException.xml
+++ b/docs/Mono.Android/en/Java.Lang/ReflectiveOperationException.xml
@@ -87,13 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new exception with <c>null</c> as its detail
-            message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ReflectiveOperationException#ReflectiveOperationException()" title="Reference documentation">Java documentation for <code>java.lang.ReflectiveOperationException.ReflectiveOperationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ReflectiveOperationException#ReflectiveOperationException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.ReflectiveOperationException.ReflectiveOperationException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,13 +128,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new exception with <c>null</c> as its detail
-            message.</summary>
+        <param name="message">the detail message. The detail message is saved for
+                     later retrieval by the <c>#getMessage()</c> method.</param>
+        <summary>Constructs a new exception with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ReflectiveOperationException#ReflectiveOperationException()" title="Reference documentation">Java documentation for <code>java.lang.ReflectiveOperationException.ReflectiveOperationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ReflectiveOperationException#ReflectiveOperationException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ReflectiveOperationException.ReflectiveOperationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,14 +189,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new exception with <c>null</c> as its detail
-            message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified detail message
+            and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ReflectiveOperationException#ReflectiveOperationException()" title="Reference documentation">Java documentation for <code>java.lang.ReflectiveOperationException.ReflectiveOperationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ReflectiveOperationException#ReflectiveOperationException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.ReflectiveOperationException.ReflectiveOperationException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Runtime.xml b/docs/Mono.Android/en/Java.Lang/Runtime.xml
index 6f706c1f12..24a14b2b4d 100644
--- a/docs/Mono.Android/en/Java.Lang/Runtime.xml
+++ b/docs/Mono.Android/en/Java.Lang/Runtime.xml
@@ -208,14 +208,14 @@
         <Parameter Name="cmdarray" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="cmdarray">To be added.</param>
-        <param name="command">a specified system command.</param>
-        <summary>Executes the specified string command in a separate process.</summary>
+        <param name="cmdarray">array containing the command to call and
+                               its arguments.</param>
+        <summary>Executes the specified command and arguments in a separate process.</summary>
         <returns>A new <c>Process</c> object for managing the subprocess</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String[])" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -253,15 +253,19 @@
         <Parameter Name="envp" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="envp">the array containing the environment to start the new process
-            in.</param>
         <param name="command">a specified system command.</param>
-        <summary>Executes the specified string command in a separate process.</summary>
+        <param name="envp">array of strings, each element of which
+                               has environment variable settings in the format
+                               <i>name</i>=<i>value</i>, or
+                               <c>null</c> if the subprocess should inherit
+                               the environment of the current process.</param>
+        <summary>Executes the specified string command in a separate process with the
+            specified environment.</summary>
         <returns>A new <c>Process</c> object for managing the subprocess</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -299,16 +303,20 @@
         <Parameter Name="envp" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="cmdarray">To be added.</param>
-        <param name="envp">the array containing the environment to start the new process
-            in.</param>
-        <param name="command">a specified system command.</param>
-        <summary>Executes the specified string command in a separate process.</summary>
+        <param name="cmdarray">array containing the command to call and
+                               its arguments.</param>
+        <param name="envp">array of strings, each element of which
+                               has environment variable settings in the format
+                               <i>name</i>=<i>value</i>, or
+                               <c>null</c> if the subprocess should inherit
+                               the environment of the current process.</param>
+        <summary>Executes the specified command and arguments in a separate process
+            with the specified environment.</summary>
         <returns>A new <c>Process</c> object for managing the subprocess</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String[],%20java.lang.String[])" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String[], java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -347,16 +355,22 @@
         <Parameter Name="dir" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="envp">the array containing the environment to start the new process
-            in.</param>
-        <param name="dir">To be added.</param>
         <param name="command">a specified system command.</param>
-        <summary>Executes the specified string command in a separate process.</summary>
+        <param name="envp">array of strings, each element of which
+                               has environment variable settings in the format
+                               <i>name</i>=<i>value</i>, or
+                               <c>null</c> if the subprocess should inherit
+                               the environment of the current process.</param>
+        <param name="dir">the working directory of the subprocess, or
+                               <c>null</c> if the subprocess should inherit
+                               the working directory of the current process.</param>
+        <summary>Executes the specified string command in a separate process with the
+            specified environment and working directory.</summary>
         <returns>A new <c>Process</c> object for managing the subprocess</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String,%20java.lang.String[],%20java.io.File)" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String, java.lang.String[], java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -395,17 +409,23 @@
         <Parameter Name="dir" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="cmdarray">To be added.</param>
-        <param name="envp">the array containing the environment to start the new process
-            in.</param>
-        <param name="dir">To be added.</param>
-        <param name="command">a specified system command.</param>
-        <summary>Executes the specified string command in a separate process.</summary>
+        <param name="cmdarray">array containing the command to call and
+                               its arguments.</param>
+        <param name="envp">array of strings, each element of which
+                               has environment variable settings in the format
+                               <i>name</i>=<i>value</i>, or
+                               <c>null</c> if the subprocess should inherit
+                               the environment of the current process.</param>
+        <param name="dir">the working directory of the subprocess, or
+                               <c>null</c> if the subprocess should inherit
+                               the working directory of the current process.</param>
+        <summary>Executes the specified command and arguments in a separate process with
+            the specified environment and working directory.</summary>
         <returns>A new <c>Process</c> object for managing the subprocess</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Runtime#exec(java.lang.String[],%20java.lang.String[],%20java.io.File)" title="Reference documentation">Java documentation for <code>java.lang.Runtime.exec(java.lang.String[], java.lang.String[], java.io.File)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/RuntimeException.xml b/docs/Mono.Android/en/Java.Lang/RuntimeException.xml
index 9e7381b3d7..41f0384ae2 100644
--- a/docs/Mono.Android/en/Java.Lang/RuntimeException.xml
+++ b/docs/Mono.Android/en/Java.Lang/RuntimeException.xml
@@ -91,13 +91,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new runtime exception with <c>null</c> as its
-            detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new runtime exception with the specified cause and a
+            detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/RuntimeException#RuntimeException()" title="Reference documentation">Java documentation for <code>java.lang.RuntimeException.RuntimeException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/RuntimeException#RuntimeException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.RuntimeException.RuntimeException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -129,13 +134,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new runtime exception with <c>null</c> as its
-            detail message.</summary>
+        <param name="message">the detail message. The detail message is saved for
+                     later retrieval by the <c>#getMessage()</c> method.</param>
+        <summary>Constructs a new runtime exception with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/RuntimeException#RuntimeException()" title="Reference documentation">Java documentation for <code>java.lang.RuntimeException.RuntimeException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/RuntimeException#RuntimeException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.RuntimeException.RuntimeException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -191,14 +196,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new runtime exception with <c>null</c> as its
-            detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new runtime exception with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/RuntimeException#RuntimeException()" title="Reference documentation">Java documentation for <code>java.lang.RuntimeException.RuntimeException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/RuntimeException#RuntimeException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.RuntimeException.RuntimeException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/SecurityException.xml b/docs/Mono.Android/en/Java.Lang/SecurityException.xml
index ac7e2e0dfa..e531c1d035 100644
--- a/docs/Mono.Android/en/Java.Lang/SecurityException.xml
+++ b/docs/Mono.Android/en/Java.Lang/SecurityException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SecurityException&lt;/code&gt; with no detail  message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a &lt;code&gt;SecurityException&lt;/code&gt; with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/SecurityException#SecurityException()" title="Reference documentation">Java documentation for <code>java.lang.SecurityException.SecurityException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/SecurityException#SecurityException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.SecurityException.SecurityException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SecurityException&lt;/code&gt; with no detail  message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;SecurityException&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/SecurityException#SecurityException()" title="Reference documentation">Java documentation for <code>java.lang.SecurityException.SecurityException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/SecurityException#SecurityException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.SecurityException.SecurityException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SecurityException&lt;/code&gt; with no detail  message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a &lt;code&gt;SecurityException&lt;/code&gt; with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/SecurityException#SecurityException()" title="Reference documentation">Java documentation for <code>java.lang.SecurityException.SecurityException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/SecurityException#SecurityException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.SecurityException.SecurityException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Short.xml b/docs/Mono.Android/en/Java.Lang/Short.xml
index fdd7caedcc..c2f632b49b 100644
--- a/docs/Mono.Android/en/Java.Lang/Short.xml
+++ b/docs/Mono.Android/en/Java.Lang/Short.xml
@@ -71,16 +71,14 @@
         <Parameter Name="value" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <param name="s">the <c>String</c> to be converted to a
-                     <c>Short</c></param>
+        <param name="value">the value to be represented by the
+                             <c>Short</c>.</param>
         <summary>Constructs a newly allocated <c>Short</c> object that
-            represents the <c>short</c> value indicated by the
-            <c>String</c> parameter.</summary>
+            represents the specified <c>short</c> value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Short#Short(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Short.Short(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Short#Short(short)" title="Reference documentation">Java documentation for <code>java.lang.Short.Short(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -459,14 +457,14 @@
         <Parameter Name="value" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <summary>Returns a hash code for this <c>Short</c>; equal to the result
-            of invoking <c>intValue()</c>.</summary>
-        <returns>a hash code value for this <c>Short</c></returns>
+        <param name="value">the value to hash</param>
+        <summary>Returns a hash code for a <c>short</c> value; compatible with
+            <c>Short.hashCode()</c>.</summary>
+        <returns>a hash code value for a <c>short</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Short#hashCode()" title="Reference documentation">Java documentation for <code>java.lang.Short.hashCode()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Short#hashCode(short)" title="Reference documentation">Java documentation for <code>java.lang.Short.hashCode(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -787,16 +785,17 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix to use when parsing.</param>
-        <param name="s">a <c>String</c> containing the <c>short</c>
-                     representation to be parsed</param>
-        <summary>Parses the string argument as a signed decimal <c>short</c>.</summary>
-        <returns>the <c>short</c> value represented by the
-                     argument in decimal.</returns>
+        <param name="s">the <c>String</c> containing the
+                             <c>short</c> representation to be parsed</param>
+        <param name="radix">the radix to be used while parsing <c>s</c></param>
+        <summary>Parses the string argument as a signed <c>short</c> in the
+            radix specified by the second argument.</summary>
+        <returns>the <c>short</c> represented by the string
+                             argument in the specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Short#parseShort(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Short.parseShort(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Short#parseShort(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Short.parseShort(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -977,15 +976,14 @@
         <Parameter Name="s" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Returns a <c>String</c> object representing this
-            <c>Short</c>'s value.</summary>
-        <returns>a string representation of the value of this object in
-                     base&amp;nbsp;10.</returns>
+        <param name="s">the <c>short</c> to be converted</param>
+        <summary>Returns a new <c>String</c> object representing the
+            specified <c>short</c>.</summary>
+        <returns>the string representation of the specified <c>short</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Short#toString()" title="Reference documentation">Java documentation for <code>java.lang.Short.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Short#toString(short)" title="Reference documentation">Java documentation for <code>java.lang.Short.toString(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -1142,15 +1140,14 @@
         <Parameter Name="s" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="s">the string to be parsed</param>
-        <summary>Returns a <c>Short</c> object holding the
-            value given by the specified <c>String</c>.</summary>
-        <returns>a <c>Short</c> object holding the value
-                     represented by the string argument</returns>
+        <param name="s">a short value.</param>
+        <summary>Returns a <c>Short</c> instance representing the specified
+            <c>short</c> value.</summary>
+        <returns>a <c>Short</c> instance representing <c>s</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Short#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Short.valueOf(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Short#valueOf(short)" title="Reference documentation">Java documentation for <code>java.lang.Short.valueOf(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -1231,16 +1228,18 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix to use when parsing.</param>
         <param name="s">the string to be parsed</param>
-        <summary>Returns a <c>Short</c> object holding the
-            value given by the specified <c>String</c>.</summary>
+        <param name="radix">the radix to be used in interpreting <c>s</c></param>
+        <summary>Returns a <c>Short</c> object holding the value
+            extracted from the specified <c>String</c> when parsed
+            with the radix given by the second argument.</summary>
         <returns>a <c>Short</c> object holding the value
-                     represented by the string argument</returns>
+                             represented by the string argument in the
+                             specified radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Short#valueOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Short.valueOf(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Short#valueOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Short.valueOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml b/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml
index 4ebf1a8b22..9c361c0cfb 100644
--- a/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml
+++ b/docs/Mono.Android/en/Java.Lang/StackOverflowError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;StackOverflowError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;StackOverflowError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StackOverflowError#StackOverflowError()" title="Reference documentation">Java documentation for <code>java.lang.StackOverflowError.StackOverflowError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StackOverflowError#StackOverflowError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StackOverflowError.StackOverflowError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/StrictMath.xml b/docs/Mono.Android/en/Java.Lang/StrictMath.xml
index 2819af2238..c27ec77f90 100644
--- a/docs/Mono.Android/en/Java.Lang/StrictMath.xml
+++ b/docs/Mono.Android/en/Java.Lang/StrictMath.xml
@@ -100,13 +100,13 @@
         <Parameter Name="a" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="a">the argument whose absolute value is to be determined</param>
-        <summary>Returns the absolute value of a <c>double</c> value.</summary>
+        <param name="a">the  argument whose absolute value is to be determined.</param>
+        <summary>Returns the absolute value of an <c>int</c> value.</summary>
         <returns>the absolute value of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#abs(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.abs(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#abs(int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.abs(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,13 +141,13 @@
         <Parameter Name="a" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="a">the argument whose absolute value is to be determined</param>
-        <summary>Returns the absolute value of a <c>double</c> value.</summary>
+        <param name="a">the  argument whose absolute value is to be determined.</param>
+        <summary>Returns the absolute value of a <c>long</c> value.</summary>
         <returns>the absolute value of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#abs(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.abs(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#abs(long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.abs(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -183,12 +183,12 @@
       </Parameters>
       <Docs>
         <param name="a">the argument whose absolute value is to be determined</param>
-        <summary>Returns the absolute value of a <c>double</c> value.</summary>
+        <summary>Returns the absolute value of a <c>float</c> value.</summary>
         <returns>the absolute value of the argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#abs(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.abs(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#abs(float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.abs(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -312,12 +312,12 @@
         <param name="x">the first value</param>
         <param name="y">the second value</param>
         <summary>Returns the sum of its arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+            throwing an exception if the result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#addExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.addExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#addExact(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.addExact(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -624,7 +624,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#copySign(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.copySign(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#copySign(float,%20float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.copySign(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -957,13 +957,13 @@
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
         <summary>Returns the largest (closest to positive infinity)
-            <c>int</c> value that is less than or equal to the algebraic quotient.</summary>
+            <c>long</c> value that is less than or equal to the algebraic quotient.</summary>
         <returns>the largest (closest to positive infinity)
             <c>int</c> value that is less than or equal to the algebraic quotient.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorDiv(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorDiv(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorDiv(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorDiv(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1001,13 +1001,13 @@
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
         <summary>Returns the largest (closest to positive infinity)
-            <c>int</c> value that is less than or equal to the algebraic quotient.</summary>
+            <c>long</c> value that is less than or equal to the algebraic quotient.</summary>
         <returns>the largest (closest to positive infinity)
-            <c>int</c> value that is less than or equal to the algebraic quotient.</returns>
+            <c>long</c> value that is less than or equal to the algebraic quotient.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorDiv(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorDiv(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorDiv(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorDiv(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1086,12 +1086,12 @@
       <Docs>
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
-        <summary>Returns the floor modulus of the <c>int</c> arguments.</summary>
+        <summary>Returns the floor modulus of the <c>long</c> and <c>int</c> arguments.</summary>
         <returns>the floor modulus <c>x - (floorDiv(x, y) * y)</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorMod(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorMod(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorMod(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorMod(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1128,12 +1128,12 @@
       <Docs>
         <param name="x">the dividend</param>
         <param name="y">the divisor</param>
-        <summary>Returns the floor modulus of the <c>int</c> arguments.</summary>
+        <summary>Returns the floor modulus of the <c>long</c> arguments.</summary>
         <returns>the floor modulus <c>x - (floorDiv(x, y) * y)</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorMod(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorMod(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#floorMod(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.floorMod(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1209,15 +1209,14 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">a <c>double</c> value</param>
+        <param name="f">a <c>float</c> value</param>
         <summary>Returns the unbiased exponent used in the representation of a
-            <c>double</c>.</summary>
+            <c>float</c>.</summary>
         <returns>the unbiased exponent of the argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#getExponent(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.getExponent(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#getExponent(float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.getExponent(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1545,12 +1544,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the greater of two <c>double</c> values.</summary>
+        <summary>Returns the greater of two <c>int</c> values.</summary>
         <returns>the larger of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#max(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.max(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#max(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.max(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1588,12 +1587,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the greater of two <c>double</c> values.</summary>
+        <summary>Returns the greater of two <c>long</c> values.</summary>
         <returns>the larger of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#max(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.max(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#max(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.max(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1631,12 +1630,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the greater of two <c>double</c> values.</summary>
+        <summary>Returns the greater of two <c>float</c> values.</summary>
         <returns>the larger of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#max(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.max(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#max(float,%20float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.max(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1717,12 +1716,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the smaller of two <c>double</c> values.</summary>
+        <summary>Returns the smaller of two <c>int</c> values.</summary>
         <returns>the smaller of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#min(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.min(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#min(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.min(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1760,12 +1759,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the smaller of two <c>double</c> values.</summary>
+        <summary>Returns the smaller of two <c>long</c> values.</summary>
         <returns>the smaller of <c>a</c> and <c>b</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#min(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.min(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#min(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.min(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1803,12 +1802,12 @@
       <Docs>
         <param name="a">an argument.</param>
         <param name="b">another argument.</param>
-        <summary>Returns the smaller of two <c>double</c> values.</summary>
-        <returns>the smaller of <c>a</c> and <c>b</c>.</returns>
+        <summary>Returns the smaller of two <c>float</c> values.</summary>
+        <returns>the smaller of <c>a</c> and <c>b.</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#min(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.min(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#min(float,%20float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.min(float, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1889,13 +1888,13 @@
       <Docs>
         <param name="x">the first value</param>
         <param name="y">the second value</param>
-        <summary>Returns the product of the arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+        <summary>Returns the product of the arguments, throwing an exception if the result
+            overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#multiplyExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.multiplyExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#multiplyExact(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.multiplyExact(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1933,12 +1932,12 @@
         <param name="x">the first value</param>
         <param name="y">the second value</param>
         <summary>Returns the product of the arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+            throwing an exception if the result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#multiplyExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.multiplyExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#multiplyExact(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.multiplyExact(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2116,7 +2115,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#nextAfter(double,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.nextAfter(double, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#nextAfter(float,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.nextAfter(float, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -2193,16 +2192,15 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">starting floating-point value</param>
-        <summary>Returns the floating-point value adjacent to <c>d</c> in
+        <param name="f">starting floating-point value</param>
+        <summary>Returns the floating-point value adjacent to <c>f</c> in
             the direction of negative infinity.</summary>
         <returns>The adjacent floating-point value closer to negative
             infinity.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#nextDown(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.nextDown(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#nextDown(float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.nextDown(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2279,16 +2277,15 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">starting floating-point value</param>
-        <summary>Returns the floating-point value adjacent to <c>d</c> in
+        <param name="f">starting floating-point value</param>
+        <summary>Returns the floating-point value adjacent to <c>f</c> in
             the direction of positive infinity.</summary>
         <returns>The adjacent floating-point value closer to positive
             infinity.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#nextUp(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.nextUp(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#nextUp(float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.nextUp(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2533,16 +2530,15 @@
         <Parameter Name="a" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="a">a floating-point value to be rounded to a
-                     <c>long</c>.</param>
-        <summary>Returns the closest <c>long</c> to the argument, with ties
+        <param name="a">a floating-point value to be rounded to an integer.</param>
+        <summary>Returns the closest <c>int</c> to the argument, with ties
             rounding to positive infinity.</summary>
         <returns>the value of the argument rounded to the nearest
-                     <c>long</c> value.</returns>
+                     <c>int</c> value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#round(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.round(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#round(float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.round(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2625,19 +2621,18 @@
         <Parameter Name="scaleFactor" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="d">number to be scaled by a power of two.</param>
-        <param name="scaleFactor">power of 2 used to scale <c>d</c></param>
-        <summary>Returns <c>d</c> &amp;times;
+        <param name="f">number to be scaled by a power of two.</param>
+        <param name="scaleFactor">power of 2 used to scale <c>f</c></param>
+        <summary>Returns <c>f</c> &amp;times;
             2&lt;sup&gt;<c>scaleFactor</c>&lt;/sup&gt; rounded as if performed
             by a single correctly rounded floating-point multiply to a
-            member of the double value set.</summary>
+            member of the float value set.</summary>
         <returns>
-          <c>d</c> &amp;times; 2&lt;sup&gt;<c>scaleFactor</c>&lt;/sup&gt;</returns>
+          <c>f</c> &amp;times; 2&lt;sup&gt;<c>scaleFactor</c>&lt;/sup&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#scalb(double,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.scalb(double, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#scalb(float,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.scalb(float, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2714,15 +2709,14 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">the value whose signum has to be computed.</param>
-        <param name="d">the floating-point value whose signum is to be returned</param>
+        <param name="f">the floating-point value whose signum is to be returned</param>
         <summary>Returns the signum function of the argument; zero if the argument
             is zero, 1.</summary>
         <returns>the signum function of the argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#signum(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.signum(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#signum(float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.signum(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2928,12 +2922,12 @@
         <param name="x">the first value</param>
         <param name="y">the second value to subtract from the first</param>
         <summary>Returns the difference of the arguments,
-            throwing an exception if the result overflows an <c>int</c>.</summary>
+            throwing an exception if the result overflows a <c>long</c>.</summary>
         <returns>the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#subtractExact(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.subtractExact(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#subtractExact(long,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.subtractExact(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3279,14 +3273,13 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">the floating-point value to compute ulp of.</param>
-        <param name="d">the floating-point value whose ulp is to be returned</param>
+        <param name="f">the floating-point value whose ulp is to be returned</param>
         <summary>Returns the size of an ulp of the argument.</summary>
         <returns>the size of an ulp of the argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StrictMath#ulp(double)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.ulp(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StrictMath#ulp(float)" title="Reference documentation">Java documentation for <code>java.lang.StrictMath.ulp(float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/String.xml b/docs/Mono.Android/en/Java.Lang/String.xml
index c150246d29..1c574d79aa 100644
--- a/docs/Mono.Android/en/Java.Lang/String.xml
+++ b/docs/Mono.Android/en/Java.Lang/String.xml
@@ -103,13 +103,13 @@
         <Parameter Name="buffer" Type="Java.Lang.StringBuffer" />
       </Parameters>
       <Docs>
-        <param name="buffer">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="buffer">A <c>StringBuffer</c></param>
+        <summary>Allocates a new string that contains the sequence of characters
+            currently contained in the string buffer argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(java.lang.StringBuffer)" title="Reference documentation">Java documentation for <code>java.lang.String.String(java.lang.StringBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,13 +141,13 @@
         <Parameter Name="builder" Type="Java.Lang.StringBuilder" />
       </Parameters>
       <Docs>
-        <param name="builder">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="builder">A <c>StringBuilder</c></param>
+        <summary>Allocates a new string that contains the sequence of characters
+            currently contained in the string builder argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(java.lang.StringBuilder)" title="Reference documentation">Java documentation for <code>java.lang.String.String(java.lang.StringBuilder)</code>.</a>
             </format>
           </para>
           <para>
@@ -180,13 +180,13 @@
         <Parameter Name="bytes" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="bytes">The bytes to be decoded into characters</param>
+        <summary>Constructs a new <c>String</c> by decoding the specified array of bytes
+            using the platform's default charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[])" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -276,14 +276,15 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
-        <param name="charset">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="bytes">The bytes to be decoded into characters</param>
+        <param name="charset">The java.nio.charset.Charset charset to be used to
+                    decode the <c>bytes</c></param>
+        <summary>Constructs a new <c>String</c> by decoding the specified array of
+            bytes using the specified java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[],%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[], java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -321,14 +322,14 @@
         <Parameter Name="hibyte" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="ascii">To be added.</param>
-        <param name="hibyte">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="ascii">The bytes to be converted to characters</param>
+        <param name="hibyte">The top 8 bits of each 16-bit Unicode code unit</param>
+        <summary>Allocates a new <c>String</c> containing characters constructed from
+            an array of 8-bit integer values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -362,14 +363,15 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
-        <param name="charsetName">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="bytes">The bytes to be decoded into characters</param>
+        <param name="charsetName">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <summary>Constructs a new <c>String</c> by decoding the specified array of bytes
+            using the specified java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -406,15 +408,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="bytes">The bytes to be decoded into characters</param>
+        <param name="offset">The index of the first byte to decode</param>
+        <param name="length">The number of bytes to decode</param>
+        <summary>Constructs a new <c>String</c> by decoding the specified subarray of
+            bytes using the platform's default charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -485,15 +487,15 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="codePoints">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="count">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="codePoints">Array that is the source of Unicode code points</param>
+        <param name="offset">The initial offset</param>
+        <param name="count">The length</param>
+        <summary>Allocates a new <c>String</c> that contains characters from a subarray
+            of the &lt;a href="Character.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.String(int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -533,16 +535,17 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="charset">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="bytes">The bytes to be decoded into characters</param>
+        <param name="offset">The index of the first byte to decode</param>
+        <param name="length">The number of bytes to decode</param>
+        <param name="charset">The java.nio.charset.Charset charset to be used to
+                    decode the <c>bytes</c></param>
+        <summary>Constructs a new <c>String</c> by decoding the specified subarray of
+            bytes using the specified java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[],%20int,%20int,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[], int, int, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -583,16 +586,16 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="ascii">To be added.</param>
-        <param name="hibyte">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="count">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="ascii">The bytes to be converted to characters</param>
+        <param name="hibyte">The top 8 bits of each 16-bit Unicode code unit</param>
+        <param name="offset">The initial offset</param>
+        <param name="count">The length</param>
+        <summary>Allocates a new <c>String</c> constructed from a subarray of an array
+            of 8-bit integer values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -629,16 +632,17 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="charsetName">To be added.</param>
-        <summary>Initializes a newly created <c>String</c> object so that it represents
-            an empty character sequence.</summary>
+        <param name="bytes">The bytes to be decoded into characters</param>
+        <param name="offset">The index of the first byte to decode</param>
+        <param name="length">The number of bytes to decode</param>
+        <param name="charsetName">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <summary>Constructs a new <c>String</c> by decoding the specified subarray of
+            bytes using the specified charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#String()" title="Reference documentation">Java documentation for <code>java.lang.String.String()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#String(byte[],%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.String.String(byte[], int, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1157,16 +1161,16 @@
         <Parameter Name="sb" Type="Java.Lang.StringBuffer" />
       </Parameters>
       <Docs>
-        <param name="sb">the StringBuffer to compare this string to.</param>
-        <param name="cs">The sequence to compare this <c>String</c> against</param>
-        <summary>Compares this string to the specified <c>CharSequence</c>.</summary>
+        <param name="sb">The <c>StringBuffer</c> to compare this <c>String</c> against</param>
+        <summary>Compares this string to the specified <c>StringBuffer</c>.</summary>
         <returns>
           <c>true</c> if this <c>String</c> represents the same
-                     sequence of char values as the specified sequence, <c>false</c> otherwise</returns>
+                     sequence of characters as the specified <c>StringBuffer</c>,
+                     <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#contentEquals(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.String.contentEquals(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#contentEquals(java.lang.StringBuffer)" title="Reference documentation">Java documentation for <code>java.lang.String.contentEquals(java.lang.StringBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1284,16 +1288,16 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="count">To be added.</param>
         <param name="data">the character array.</param>
-        <summary>Equivalent to <c>#valueOf(char[])</c>.</summary>
+        <param name="offset">initial offset of the subarray.</param>
+        <param name="count">length of the subarray.</param>
+        <summary>Equivalent to <c>#valueOf(char[], int, int)</c>.</summary>
         <returns>a <c>String</c> that contains the characters of the
-                     character array.</returns>
+                     specified subarray of the character array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#copyValueOf(char[])" title="Reference documentation">Java documentation for <code>java.lang.String.copyValueOf(char[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#copyValueOf(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.copyValueOf(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1582,14 +1586,15 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="charset">To be added.</param>
-        <summary>Encodes this <c>String</c> into a sequence of bytes using the
-            platform's default charset, storing the result into a new byte array.</summary>
+        <param name="charset">The java.nio.charset.Charset to be used to encode
+                    the <c>String</c></param>
+        <summary>Encodes this <c>String</c> into a sequence of bytes using the given
+            java.</summary>
         <returns>The resultant byte array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#getBytes()" title="Reference documentation">Java documentation for <code>java.lang.String.getBytes()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#getBytes(java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.lang.String.getBytes(java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -1624,14 +1629,15 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">To be added.</param>
-        <summary>Encodes this <c>String</c> into a sequence of bytes using the
-            platform's default charset, storing the result into a new byte array.</summary>
+        <param name="charsetName">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <summary>Encodes this <c>String</c> into a sequence of bytes using the named
+            charset, storing the result into a new byte array.</summary>
         <returns>The resultant byte array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#getBytes()" title="Reference documentation">Java documentation for <code>java.lang.String.getBytes()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#getBytes(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.String.getBytes(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1675,17 +1681,16 @@
         <Parameter Name="dstBegin" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="srcBegin">To be added.</param>
-        <param name="srcEnd">To be added.</param>
-        <param name="dst">To be added.</param>
-        <param name="dstBegin">To be added.</param>
-        <summary>Encodes this <c>String</c> into a sequence of bytes using the
-            platform's default charset, storing the result into a new byte array.</summary>
+        <param name="srcBegin">Index of the first character in the string to copy</param>
+        <param name="srcEnd">Index after the last character in the string to copy</param>
+        <param name="dst">The destination array</param>
+        <param name="dstBegin">The start offset in the destination array</param>
+        <summary>Copies characters from this string into the destination byte array.</summary>
         <returns>The resultant byte array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#getBytes()" title="Reference documentation">Java documentation for <code>java.lang.String.getBytes()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#getBytes(int,%20int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.getBytes(int, int, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1850,17 +1855,15 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="str">To be added.</param>
-        <param name="ch">a character (Unicode code point).</param>
-        <summary>Returns the index within this string of the first occurrence of
-            the specified character.</summary>
-        <returns>the index of the first occurrence of the character in the
-                     character sequence represented by this object, or
-                     <c>-1</c> if the character does not occur.</returns>
+        <param name="str">the substring to search for.</param>
+        <summary>Returns the index within this string of the first occurrence of the
+            specified substring.</summary>
+        <returns>the index of the first occurrence of the specified substring,
+                     or <c>-1</c> if there is no such occurrence.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#indexOf(int)" title="Reference documentation">Java documentation for <code>java.lang.String.indexOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#indexOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.String.indexOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1898,17 +1901,18 @@
         <Parameter Name="fromIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
         <param name="ch">a character (Unicode code point).</param>
-        <summary>Returns the index within this string of the first occurrence of
-            the specified character.</summary>
+        <param name="fromIndex">the index to start the search from.</param>
+        <summary>Returns the index within this string of the first occurrence of the
+            specified character, starting the search at the specified index.</summary>
         <returns>the index of the first occurrence of the character in the
-                     character sequence represented by this object, or
-                     <c>-1</c> if the character does not occur.</returns>
+                     character sequence represented by this object that is greater
+                     than or equal to <c>fromIndex</c>, or <c>-1</c>
+                     if the character does not occur.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#indexOf(int)" title="Reference documentation">Java documentation for <code>java.lang.String.indexOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#indexOf(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.indexOf(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1944,18 +1948,17 @@
         <Parameter Name="fromIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="str">To be added.</param>
-        <param name="fromIndex">To be added.</param>
-        <param name="ch">a character (Unicode code point).</param>
-        <summary>Returns the index within this string of the first occurrence of
-            the specified character.</summary>
-        <returns>the index of the first occurrence of the character in the
-                     character sequence represented by this object, or
-                     <c>-1</c> if the character does not occur.</returns>
+        <param name="str">the substring to search for.</param>
+        <param name="fromIndex">the index from which to start the search.</param>
+        <summary>Returns the index within this string of the first occurrence of the
+            specified substring, starting at the specified index.</summary>
+        <returns>the index of the first occurrence of the specified substring,
+                     starting at the specified index,
+                     or <c>-1</c> if there is no such occurrence.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#indexOf(int)" title="Reference documentation">Java documentation for <code>java.lang.String.indexOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#indexOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.indexOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2185,17 +2188,19 @@
         <Parameter Name="elements" Type="Java.Lang.IIterable" />
       </Parameters>
       <Docs>
-        <param name="delimiter">the delimiter that separates each element</param>
-        <param name="elements">the elements to join together.</param>
-        <summary>Returns a new String composed of copies of the
-            <c>CharSequence elements</c> joined together with a copy of
-            the specified <c>delimiter</c>.</summary>
-        <returns>a new <c>String</c> that is composed of the <c>elements</c>
-                    separated by the <c>delimiter</c></returns>
+        <param name="delimiter">a sequence of characters that is used to separate each
+                    of the <c>elements</c> in the resulting <c>String</c></param>
+        <param name="elements">an <c>Iterable</c> that will have its <c>elements</c>
+                    joined together.</param>
+        <summary>Returns a new <c>String</c> composed of copies of the
+            <c>CharSequence elements</c> joined together with a copy of the
+            specified <c>delimiter</c>.</summary>
+        <returns>a new <c>String</c> that is composed from the <c>elements</c>
+                    argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#join(java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.String.join(java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#join(java.lang.CharSequence,%20java.lang.Iterable)" title="Reference documentation">Java documentation for <code>java.lang.String.join(java.lang.CharSequence, java.lang.Iterable)</code>.</a>
             </format>
           </para>
           <para>
@@ -2224,17 +2229,19 @@
         <Parameter Name="elements" Type="Java.Lang.IIterable" />
       </Parameters>
       <Docs>
-        <param name="delimiter">the delimiter that separates each element</param>
-        <param name="elements">the elements to join together.</param>
-        <summary>Returns a new String composed of copies of the
-            <c>CharSequence elements</c> joined together with a copy of
-            the specified <c>delimiter</c>.</summary>
-        <returns>a new <c>String</c> that is composed of the <c>elements</c>
-                    separated by the <c>delimiter</c></returns>
+        <param name="delimiter">a sequence of characters that is used to separate each
+                    of the <c>elements</c> in the resulting <c>String</c></param>
+        <param name="elements">an <c>Iterable</c> that will have its <c>elements</c>
+                    joined together.</param>
+        <summary>Returns a new <c>String</c> composed of copies of the
+            <c>CharSequence elements</c> joined together with a copy of the
+            specified <c>delimiter</c>.</summary>
+        <returns>a new <c>String</c> that is composed from the <c>elements</c>
+                    argument</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#join(java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.String.join(java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#join(java.lang.CharSequence,%20java.lang.Iterable)" title="Reference documentation">Java documentation for <code>java.lang.String.join(java.lang.CharSequence, java.lang.Iterable)</code>.</a>
             </format>
           </para>
           <para>
@@ -2358,17 +2365,15 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="str">To be added.</param>
-        <param name="ch">a character (Unicode code point).</param>
-        <summary>Returns the index within this string of the last occurrence of
-            the specified character.</summary>
-        <returns>the index of the last occurrence of the character in the
-                     character sequence represented by this object, or
-                     <c>-1</c> if the character does not occur.</returns>
+        <param name="str">the substring to search for.</param>
+        <summary>Returns the index within this string of the last occurrence of the
+            specified substring.</summary>
+        <returns>the index of the last occurrence of the specified substring,
+                     or <c>-1</c> if there is no such occurrence.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#lastIndexOf(int)" title="Reference documentation">Java documentation for <code>java.lang.String.lastIndexOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#lastIndexOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.String.lastIndexOf(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2406,17 +2411,25 @@
         <Parameter Name="fromIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
         <param name="ch">a character (Unicode code point).</param>
+        <param name="fromIndex">the index to start the search from. There is no
+                     restriction on the value of <c>fromIndex</c>. If it is
+                     greater than or equal to the length of this string, it has
+                     the same effect as if it were equal to one less than the
+                     length of this string: this entire string may be searched.
+                     If it is negative, it has the same effect as if it were -1:
+                     -1 is returned.</param>
         <summary>Returns the index within this string of the last occurrence of
-            the specified character.</summary>
+            the specified character, searching backward starting at the
+            specified index.</summary>
         <returns>the index of the last occurrence of the character in the
-                     character sequence represented by this object, or
-                     <c>-1</c> if the character does not occur.</returns>
+                     character sequence represented by this object that is less
+                     than or equal to <c>fromIndex</c>, or <c>-1</c>
+                     if the character does not occur before that point.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#lastIndexOf(int)" title="Reference documentation">Java documentation for <code>java.lang.String.lastIndexOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#lastIndexOf(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.lastIndexOf(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2452,18 +2465,17 @@
         <Parameter Name="fromIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="str">To be added.</param>
-        <param name="fromIndex">To be added.</param>
-        <param name="ch">a character (Unicode code point).</param>
-        <summary>Returns the index within this string of the last occurrence of
-            the specified character.</summary>
-        <returns>the index of the last occurrence of the character in the
-                     character sequence represented by this object, or
-                     <c>-1</c> if the character does not occur.</returns>
+        <param name="str">the substring to search for.</param>
+        <param name="fromIndex">the index to start the search from.</param>
+        <summary>Returns the index within this string of the last occurrence of the
+            specified substring, searching backward starting at the specified index.</summary>
+        <returns>the index of the last occurrence of the specified substring,
+                     searching backward from the specified index,
+                     or <c>-1</c> if there is no such occurrence.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#lastIndexOf(int)" title="Reference documentation">Java documentation for <code>java.lang.String.lastIndexOf(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#lastIndexOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.lastIndexOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2691,22 +2703,25 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="ignoreCase">specifies if case should be ignored (use <see cref="T:Java.Text.Collator" /> instead for
-     non-ASCII case insensitivity).</param>
-        <param name="toffset">the starting offset of the subregion in this string.</param>
+        <param name="ignoreCase">if <c>true</c>, ignore case when comparing
+                                  characters.</param>
+        <param name="toffset">the starting offset of the subregion in this
+                                  string.</param>
         <param name="other">the string argument.</param>
         <param name="ooffset">the starting offset of the subregion in the string
-                               argument.</param>
+                                  argument.</param>
         <param name="len">the number of characters to compare.</param>
         <summary>Tests if two string regions are equal.</summary>
         <returns>
           <c>true</c> if the specified subregion of this string
-                     exactly matches the specified subregion of the string argument;
-                     <c>false</c> otherwise.</returns>
+                     matches the specified subregion of the string argument;
+                     <c>false</c> otherwise. Whether the matching is exact
+                     or case insensitive depends on the <c>ignoreCase</c>
+                     argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#regionMatches(int,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.regionMatches(int, java.lang.String, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#regionMatches(boolean,%20int,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.regionMatches(boolean, int, java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2744,18 +2759,15 @@
         <Parameter Name="replacement" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="target">the sequence to replace.</param>
-        <param name="replacement">the replacement sequence.</param>
-        <param name="oldChar">the old character.</param>
-        <param name="newChar">the new character.</param>
-        <summary>Returns a string resulting from replacing all occurrences of
-            <c>oldChar</c> in this string with <c>newChar</c>.</summary>
-        <returns>a string derived from this string by replacing every
-                     occurrence of <c>oldChar</c> with <c>newChar</c>.</returns>
+        <param name="target">The sequence of char values to be replaced</param>
+        <param name="replacement">The replacement sequence of char values</param>
+        <summary>Replaces each substring of this string that matches the literal target
+            sequence with the specified literal replacement sequence.</summary>
+        <returns>The resulting string</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#replace(char,%20char)" title="Reference documentation">Java documentation for <code>java.lang.String.replace(char, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#replace(java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.String.replace(java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -2832,18 +2844,15 @@
         <Parameter Name="replacement" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="target">To be added.</param>
-        <param name="replacement">To be added.</param>
-        <param name="oldChar">the old character.</param>
-        <param name="newChar">the new character.</param>
-        <summary>Returns a string resulting from replacing all occurrences of
-            <c>oldChar</c> in this string with <c>newChar</c>.</summary>
-        <returns>a string derived from this string by replacing every
-                     occurrence of <c>oldChar</c> with <c>newChar</c>.</returns>
+        <param name="target">The sequence of char values to be replaced</param>
+        <param name="replacement">The replacement sequence of char values</param>
+        <summary>Replaces each substring of this string that matches the literal target
+            sequence with the specified literal replacement sequence.</summary>
+        <returns>The resulting string</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#replace(char,%20char)" title="Reference documentation">Java documentation for <code>java.lang.String.replace(char, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#replace(java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.String.replace(java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -3089,21 +3098,25 @@
         <Parameter Name="toffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="toffset">To be added.</param>
         <param name="prefix">the prefix.</param>
-        <summary>Tests if this string starts with the specified prefix.</summary>
+        <param name="toffset">where to begin looking in this string.</param>
+        <summary>Tests if the substring of this string beginning at the
+            specified index starts with the specified prefix.</summary>
         <returns>
           <c>true</c> if the character sequence represented by the
-                     argument is a prefix of the character sequence represented by
-                     this string; <c>false</c> otherwise.
-                     Note also that <c>true</c> will be returned if the
-                     argument is an empty string or is equal to this
-                     <c>String</c> object as determined by the
-                     <c>#equals(Object)</c> method.</returns>
+                     argument is a prefix of the substring of this object starting
+                     at index <c>toffset</c>; <c>false</c> otherwise.
+                     The result is <c>false</c> if <c>toffset</c> is
+                     negative or greater than the length of this
+                     <c>String</c> object; otherwise the result is the same
+                     as the result of the expression
+                     &lt;pre&gt;
+                     this.substring(toffset).startsWith(prefix)
+                     &lt;/pre&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#startsWith(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.String.startsWith(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#startsWith(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.startsWith(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3269,14 +3282,14 @@
         <Parameter Name="endIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="endIndex">To be added.</param>
         <param name="beginIndex">the beginning index, inclusive.</param>
+        <param name="endIndex">the ending index, exclusive.</param>
         <summary>Returns a string that is a substring of this string.</summary>
         <returns>the specified substring.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#substring(int)" title="Reference documentation">Java documentation for <code>java.lang.String.substring(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#substring(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.substring(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3479,14 +3492,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
+        <param name="locale">use the case transformation rules for this locale</param>
         <summary>Converts all of the characters in this <c>String</c> to lower
-            case using the rules of the default locale.</summary>
+            case using the rules of the given <c>Locale</c>.</summary>
         <returns>the <c>String</c>, converted to lowercase.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#toLowerCase()" title="Reference documentation">Java documentation for <code>java.lang.String.toLowerCase()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#toLowerCase(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.lang.String.toLowerCase(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -3585,14 +3598,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
+        <param name="locale">use the case transformation rules for this locale</param>
         <summary>Converts all of the characters in this <c>String</c> to upper
-            case using the rules of the default locale.</summary>
+            case using the rules of the given <c>Locale</c>.</summary>
         <returns>the <c>String</c>, converted to uppercase.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#toUpperCase()" title="Reference documentation">Java documentation for <code>java.lang.String.toUpperCase()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#toUpperCase(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.lang.String.toUpperCase(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -3668,16 +3681,15 @@
         <Parameter Name="obj" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="obj">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
-            argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <param name="obj">an <c>Object</c>.</param>
+        <summary>Returns the string representation of the <c>Object</c> argument.</summary>
+        <returns>if the argument is <c>null</c>, then a string equal to
+                     <c>"null"</c>; otherwise, the value of
+                     <c>obj.toString()</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -3712,16 +3724,15 @@
         <Parameter Name="b" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="b">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
-            argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <param name="b">a <c>boolean</c>.</param>
+        <summary>Returns the string representation of the <c>boolean</c> argument.</summary>
+        <returns>if the argument is <c>true</c>, a string equal to
+                     <c>"true"</c> is returned; otherwise, a string equal to
+                     <c>"false"</c> is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(boolean)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -3799,16 +3810,15 @@
         <Parameter Name="data" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="data">the array of characters.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
+        <param name="data">the character array.</param>
+        <summary>Returns the string representation of the <c>char</c> array
             argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <returns>a <c>String</c> that contains the characters of the
+                     character array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char[])" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3845,16 +3855,13 @@
         <Parameter Name="d" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="d">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
-            argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <param name="d">a <c>double</c>.</param>
+        <summary>Returns the string representation of the <c>double</c> argument.</summary>
+        <returns>a  string representation of the <c>double</c> argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(double)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -3889,16 +3896,13 @@
         <Parameter Name="i" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="i">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
-            argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <param name="i">an <c>int</c>.</param>
+        <summary>Returns the string representation of the <c>int</c> argument.</summary>
+        <returns>a string representation of the <c>int</c> argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(int)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3933,16 +3937,13 @@
         <Parameter Name="l" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="l">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
-            argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <param name="l">a <c>long</c>.</param>
+        <summary>Returns the string representation of the <c>long</c> argument.</summary>
+        <returns>a string representation of the <c>long</c> argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(long)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3977,16 +3978,13 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
-            argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <param name="f">a <c>float</c>.</param>
+        <summary>Returns the string representation of the <c>float</c> argument.</summary>
+        <returns>a string representation of the <c>float</c> argument.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(float)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(float)</code>.</a>
             </format>
           </para>
           <para>
@@ -4023,18 +4021,17 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="data">the array of characters.</param>
-        <param name="offset">To be added.</param>
-        <param name="count">To be added.</param>
-        <param name="c">a <c>char</c>.</param>
-        <summary>Returns the string representation of the <c>char</c>
-            argument.</summary>
-        <returns>a string of length <c>1</c> containing
-                     as its single character the argument <c>c</c>.</returns>
+        <param name="data">the character array.</param>
+        <param name="offset">initial offset of the subarray.</param>
+        <param name="count">length of the subarray.</param>
+        <summary>Returns the string representation of a specific subarray of the
+            <c>char</c> array argument.</summary>
+        <returns>a <c>String</c> that contains the characters of the
+                     specified subarray of the character array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/String#valueOf(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.String.valueOf(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/StringBuffer.xml b/docs/Mono.Android/en/Java.Lang/StringBuffer.xml
index c4ed441f1e..ba5fbdfb4b 100644
--- a/docs/Mono.Android/en/Java.Lang/StringBuffer.xml
+++ b/docs/Mono.Android/en/Java.Lang/StringBuffer.xml
@@ -113,13 +113,13 @@
         <Parameter Name="seq" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="seq">To be added.</param>
-        <summary>Constructs a string buffer with no characters in it and an
-            initial capacity of 16 characters.</summary>
+        <param name="seq">the sequence to copy.</param>
+        <summary>Constructs a string buffer that contains the same characters
+            as the specified <c>CharSequence</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#StringBuffer()" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.StringBuffer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#StringBuffer(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.StringBuffer(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -152,13 +152,13 @@
         <Parameter Name="capacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="capacity">To be added.</param>
-        <summary>Constructs a string buffer with no characters in it and an
-            initial capacity of 16 characters.</summary>
+        <param name="capacity">the initial capacity.</param>
+        <summary>Constructs a string buffer with no characters in it and
+            the specified initial capacity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#StringBuffer()" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.StringBuffer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#StringBuffer(int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.StringBuffer(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -190,13 +190,13 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="str">To be added.</param>
-        <summary>Constructs a string buffer with no characters in it and an
-            initial capacity of 16 characters.</summary>
+        <param name="str">the initial contents of the buffer.</param>
+        <summary>Constructs a string buffer initialized to the contents of the
+            specified string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#StringBuffer()" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.StringBuffer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#StringBuffer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.StringBuffer(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -236,13 +236,14 @@
         <Parameter Name="s" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="s">the CharSequence to append.</param>
-        <summary tool="true">Appends the specified CharSequence to this buffer.</summary>
-        <returns>To be added.</returns>
+        <param name="s">the <c>CharSequence</c> to append.</param>
+        <summary>Appends the specified <c>CharSequence</c> to this
+            sequence.</summary>
+        <returns>a reference to this object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(java.lang.AbstractStringBuilder)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(java.lang.AbstractStringBuilder)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -320,13 +321,13 @@
         <Parameter Name="sb" Type="Java.Lang.StringBuffer" />
       </Parameters>
       <Docs>
-        <param name="sb">the StringBuffer to append (may be null).</param>
-        <summary>Adds the specified StringBuffer to the end of this buffer.</summary>
-        <returns>To be added.</returns>
+        <param name="sb">the <c>StringBuffer</c> to append.</param>
+        <summary>Appends the specified <c>StringBuffer</c> to this sequence.</summary>
+        <returns>a reference to this object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(java.lang.AbstractStringBuilder)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(java.lang.AbstractStringBuilder)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(java.lang.StringBuffer)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(java.lang.StringBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -718,7 +719,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(java.lang.AbstractStringBuilder)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(java.lang.AbstractStringBuilder)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -766,7 +767,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(java.lang.AbstractStringBuilder)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(java.lang.AbstractStringBuilder)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#append(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.append(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1329,7 +1330,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#indexOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.indexOf(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#indexOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.indexOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1373,7 +1374,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1418,7 +1419,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1464,7 +1465,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1554,7 +1555,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char[])" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1601,7 +1602,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1647,7 +1648,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1693,7 +1694,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1739,7 +1740,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20float)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1784,7 +1785,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1834,7 +1835,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1885,7 +1886,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1930,7 +1931,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#insert(int,%20java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.insert(int, java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2049,7 +2050,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#lastIndexOf(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.lastIndexOf(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#lastIndexOf(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.lastIndexOf(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2463,7 +2464,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuffer#substring(int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.substring(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuffer#substring(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuffer.substring(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/StringBuilder.xml b/docs/Mono.Android/en/Java.Lang/StringBuilder.xml
index 233580091c..7017be0e66 100644
--- a/docs/Mono.Android/en/Java.Lang/StringBuilder.xml
+++ b/docs/Mono.Android/en/Java.Lang/StringBuilder.xml
@@ -114,13 +114,13 @@
         <Parameter Name="seq" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="seq">To be added.</param>
-        <summary>Constructs a string builder with no characters in it and an
-            initial capacity of 16 characters.</summary>
+        <param name="seq">the sequence to copy.</param>
+        <summary>Constructs a string builder that contains the same characters
+            as the specified <c>CharSequence</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#StringBuilder()" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.StringBuilder()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#StringBuilder(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.StringBuilder(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -154,13 +154,13 @@
         <Parameter Name="capacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="capacity">To be added.</param>
+        <param name="capacity">the initial capacity.</param>
         <summary>Constructs a string builder with no characters in it and an
-            initial capacity of 16 characters.</summary>
+            initial capacity specified by the <c>capacity</c> argument.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#StringBuilder()" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.StringBuilder()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#StringBuilder(int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.StringBuilder(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -194,13 +194,13 @@
         <Parameter Name="str" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="str">To be added.</param>
-        <summary>Constructs a string builder with no characters in it and an
-            initial capacity of 16 characters.</summary>
+        <param name="str">the initial contents of the buffer.</param>
+        <summary>Constructs a string builder initialized to the contents of the
+            specified string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#StringBuilder()" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.StringBuilder()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#StringBuilder(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.StringBuilder(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -324,12 +324,12 @@
       </Parameters>
       <Docs>
         <param name="sb">the <c>StringBuffer</c> to append.</param>
-        <summary>Appends the contents of the specified <c>StringBuffer</c>.</summary>
-        <returns>To be added.</returns>
+        <summary>Appends the specified <c>StringBuffer</c> to this sequence.</summary>
+        <returns>a reference to this object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.append(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#append(java.lang.StringBuffer)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.append(java.lang.StringBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -765,7 +765,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.append(java.lang.CharSequence, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#append(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.append(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1329,7 +1329,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1376,7 +1376,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1423,7 +1423,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1517,7 +1517,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char[])" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1564,7 +1564,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20double)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1611,7 +1611,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1658,7 +1658,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20long)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1705,7 +1705,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20float)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1751,7 +1751,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1802,7 +1802,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1854,7 +1854,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1899,7 +1899,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20char)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringBuilder#insert(int,%20java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.lang.StringBuilder.insert(int, java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/StringIndexOutOfBoundsException.xml b/docs/Mono.Android/en/Java.Lang/StringIndexOutOfBoundsException.xml
index d9767ca3ad..316a0030b7 100644
--- a/docs/Mono.Android/en/Java.Lang/StringIndexOutOfBoundsException.xml
+++ b/docs/Mono.Android/en/Java.Lang/StringIndexOutOfBoundsException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <summary>Constructs a <c>StringIndexOutOfBoundsException</c> with no
-            detail message.</summary>
+        <param name="index">the illegal index.</param>
+        <summary>Constructs a new <c>StringIndexOutOfBoundsException</c>
+            class with an argument indicating the illegal index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringIndexOutOfBoundsException#StringIndexOutOfBoundsException()" title="Reference documentation">Java documentation for <code>java.lang.StringIndexOutOfBoundsException.StringIndexOutOfBoundsException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringIndexOutOfBoundsException#StringIndexOutOfBoundsException(int)" title="Reference documentation">Java documentation for <code>java.lang.StringIndexOutOfBoundsException.StringIndexOutOfBoundsException(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +127,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a <c>StringIndexOutOfBoundsException</c> with no
-            detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a <c>StringIndexOutOfBoundsException</c> with
+            the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/StringIndexOutOfBoundsException#StringIndexOutOfBoundsException()" title="Reference documentation">Java documentation for <code>java.lang.StringIndexOutOfBoundsException.StringIndexOutOfBoundsException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/StringIndexOutOfBoundsException#StringIndexOutOfBoundsException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.StringIndexOutOfBoundsException.StringIndexOutOfBoundsException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Thread.xml b/docs/Mono.Android/en/Java.Lang/Thread.xml
index 2f4eb19342..9b5ec5404e 100644
--- a/docs/Mono.Android/en/Java.Lang/Thread.xml
+++ b/docs/Mono.Android/en/Java.Lang/Thread.xml
@@ -102,12 +102,14 @@
         <Parameter Name="target" Type="Java.Lang.IRunnable" />
       </Parameters>
       <Docs>
-        <param name="target">To be added.</param>
+        <param name="target">the object whose <c>run</c> method is invoked when this thread
+                    is started. If <c>null</c>, this classes <c>run</c> method does
+                    nothing.</param>
         <summary>Allocates a new <c>Thread</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#Thread()" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#Thread(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread(java.lang.Runnable)</code>.</a>
             </format>
           </para>
           <para>
@@ -162,12 +164,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
+        <param name="name">the name of the new thread</param>
         <summary>Allocates a new <c>Thread</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#Thread()" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#Thread(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,13 +204,14 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="target">To be added.</param>
-        <param name="name">To be added.</param>
+        <param name="target">the object whose <c>run</c> method is invoked when this thread
+                    is started. If <c>null</c>, this thread's run method is invoked.</param>
+        <param name="name">the name of the new thread</param>
         <summary>Allocates a new <c>Thread</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#Thread()" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#Thread(java.lang.Runnable,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread(java.lang.Runnable, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -243,13 +246,17 @@
         <Parameter Name="target" Type="Java.Lang.IRunnable" />
       </Parameters>
       <Docs>
-        <param name="group">To be added.</param>
-        <param name="target">To be added.</param>
+        <param name="group">the thread group. If <c>null</c> and there is a security
+                    manager, the group is determined by SecurityManager#getThreadGroup SecurityManager.getThreadGroup().
+                    If there is not a security manager or <c>SecurityManager.getThreadGroup()</c> returns <c>null</c>, the group
+                    is set to the current thread's thread group.</param>
+        <param name="target">the object whose <c>run</c> method is invoked when this thread
+                    is started. If <c>null</c>, this thread's run method is invoked.</param>
         <summary>Allocates a new <c>Thread</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#Thread()" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#Thread(java.lang.ThreadGroup,%20java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread(java.lang.ThreadGroup, java.lang.Runnable)</code>.</a>
             </format>
           </para>
           <para>
@@ -308,13 +315,16 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="group">To be added.</param>
-        <param name="name">To be added.</param>
+        <param name="group">the thread group. If <c>null</c> and there is a security
+                    manager, the group is determined by SecurityManager#getThreadGroup SecurityManager.getThreadGroup().
+                    If there is not a security manager or <c>SecurityManager.getThreadGroup()</c> returns <c>null</c>, the group
+                    is set to the current thread's thread group.</param>
+        <param name="name">the name of the new thread</param>
         <summary>Allocates a new <c>Thread</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#Thread()" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#Thread(java.lang.ThreadGroup,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread(java.lang.ThreadGroup, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -397,14 +407,20 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="group">To be added.</param>
-        <param name="target">To be added.</param>
-        <param name="name">To be added.</param>
-        <summary>Allocates a new <c>Thread</c> object.</summary>
+        <param name="group">the thread group. If <c>null</c> and there is a security
+                    manager, the group is determined by SecurityManager#getThreadGroup SecurityManager.getThreadGroup().
+                    If there is not a security manager or <c>SecurityManager.getThreadGroup()</c> returns <c>null</c>, the group
+                    is set to the current thread's thread group.</param>
+        <param name="target">the object whose <c>run</c> method is invoked when this thread
+                    is started. If <c>null</c>, this thread's run method is invoked.</param>
+        <param name="name">the name of the new thread</param>
+        <summary>Allocates a new <c>Thread</c> object so that it has <c>target</c>
+            as its run object, has the specified <c>name</c> as its name,
+            and belongs to the thread group referred to by <c>group</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#Thread()" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#Thread(java.lang.ThreadGroup,%20java.lang.Runnable,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -467,15 +483,23 @@
         <Parameter Name="stackSize" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="group">To be added.</param>
-        <param name="target">To be added.</param>
-        <param name="name">To be added.</param>
-        <param name="stackSize">To be added.</param>
-        <summary>Allocates a new <c>Thread</c> object.</summary>
+        <param name="group">the thread group. If <c>null</c> and there is a security
+                    manager, the group is determined by SecurityManager#getThreadGroup SecurityManager.getThreadGroup().
+                    If there is not a security manager or <c>SecurityManager.getThreadGroup()</c> returns <c>null</c>, the group
+                    is set to the current thread's thread group.</param>
+        <param name="target">the object whose <c>run</c> method is invoked when this thread
+                    is started. If <c>null</c>, this thread's run method is invoked.</param>
+        <param name="name">the name of the new thread</param>
+        <param name="stackSize">the desired stack size for the new thread, or zero to indicate
+                    that this parameter is to be ignored.</param>
+        <summary>Allocates a new <c>Thread</c> object so that it has <c>target</c>
+            as its run object, has the specified <c>name</c> as its name,
+            and belongs to the thread group referred to by <c>group</c>, and has
+            the specified <i>stack size</i>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#Thread()" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#Thread(java.lang.ThreadGroup,%20java.lang.Runnable,%20java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>java.lang.Thread.Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -857,8 +881,6 @@
         <ReturnType>Java.Lang.Thread+IUncaughtExceptionHandler</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="eh">the object to use as the default uncaught exception handler.
-            If <c>null</c> then there is no default handler.</param>
         <summary>Returns the default handler invoked when a thread abruptly terminates
             due to an uncaught exception. -or- Set the default handler invoked when a thread abruptly terminates
             due to an uncaught exception, and no other handler has been defined
@@ -1425,12 +1447,13 @@
         <Parameter Name="millis" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="millis">The maximum time to wait (in milliseconds).</param>
-        <summary>Waits for this thread to die.</summary>
+        <param name="millis">the time to wait in milliseconds</param>
+        <summary>Waits at most <c>millis</c> milliseconds for this thread to
+            die.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#join()" title="Reference documentation">Java documentation for <code>java.lang.Thread.join()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#join(long)" title="Reference documentation">Java documentation for <code>java.lang.Thread.join(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1471,13 +1494,15 @@
         <Parameter Name="nanos" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="millis">The maximum time to wait (in milliseconds).</param>
-        <param name="nanos">Extra nanosecond precision</param>
-        <summary>Waits for this thread to die.</summary>
+        <param name="millis">the time to wait in milliseconds</param>
+        <param name="nanos">
+          <c>0-999999</c> additional nanoseconds to wait</param>
+        <summary>Waits at most <c>millis</c> milliseconds plus
+            <c>nanos</c> nanoseconds for this thread to die.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#join()" title="Reference documentation">Java documentation for <code>java.lang.Thread.join()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#join(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Thread.join(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1872,15 +1897,17 @@
         <Parameter Name="nanos" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="nanos">Extra nanosecond precision</param>
         <param name="millis">the length of time to sleep in milliseconds</param>
+        <param name="nanos">
+          <c>0-999999</c> additional nanoseconds to sleep</param>
         <summary>Causes the currently executing thread to sleep (temporarily cease
-            execution) for the specified number of milliseconds, subject to
-            the precision and accuracy of system timers and schedulers.</summary>
+            execution) for the specified number of milliseconds plus the specified
+            number of nanoseconds, subject to the precision and accuracy of system
+            timers and schedulers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#sleep(long)" title="Reference documentation">Java documentation for <code>java.lang.Thread.sleep(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#sleep(long,%20int)" title="Reference documentation">Java documentation for <code>java.lang.Thread.sleep(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2004,12 +2031,12 @@
         <Parameter Name="obj" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="obj">To be added.</param>
+        <param name="obj">ignored</param>
         <summary>Throws <c>UnsupportedOperationException</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Thread#stop()" title="Reference documentation">Java documentation for <code>java.lang.Thread.stop()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Thread#stop(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.Thread.stop(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -2185,8 +2212,6 @@
         <ReturnType>Java.Lang.Thread+IUncaughtExceptionHandler</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="eh">the object to use as this thread's uncaught exception
-            handler. If <c>null</c> then this thread has no explicit handler.</param>
         <summary>Returns the handler invoked when this thread abruptly terminates
             due to an uncaught exception. -or- Set the handler invoked when this thread abruptly terminates
             due to an uncaught exception.</summary>
diff --git a/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml b/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml
index 2556740de4..0419fec67b 100644
--- a/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml
+++ b/docs/Mono.Android/en/Java.Lang/ThreadGroup.xml
@@ -67,12 +67,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Creates an empty Thread group that is not in any Thread group.</summary>
+        <param name="name">the name of the new thread group.</param>
+        <summary>Constructs a new thread group.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#ThreadGroup()" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.ThreadGroup()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#ThreadGroup(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.ThreadGroup(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -106,13 +106,13 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
-        <param name="name">To be added.</param>
-        <summary>Creates an empty Thread group that is not in any Thread group.</summary>
+        <param name="parent">the parent thread group.</param>
+        <param name="name">the name of the new thread group.</param>
+        <summary>Creates a new thread group.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#ThreadGroup()" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.ThreadGroup()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#ThreadGroup(java.lang.ThreadGroup,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.ThreadGroup(java.lang.ThreadGroup, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -477,14 +477,14 @@
         <Parameter Name="list" Type="Java.Lang.ThreadGroup[]" />
       </Parameters>
       <Docs>
-        <param name="list">an array into which to put the list of threads</param>
-        <summary>Copies into the specified array every active thread in this
-            thread group and its subgroups.</summary>
-        <returns>the number of threads put into the array</returns>
+        <param name="list">an array into which to put the list of thread groups</param>
+        <summary>Copies into the specified array references to every active
+            subgroup in this thread group and its subgroups.</summary>
+        <returns>the number of thread groups put into the array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#enumerate(java.lang.Thread[])" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.enumerate(java.lang.Thread[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#enumerate(java.lang.ThreadGroup[])" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.enumerate(java.lang.ThreadGroup[])</code>.</a>
             </format>
           </para>
           <para>
@@ -520,16 +520,16 @@
         <Parameter Name="recurse" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="recurse">indicates whether <c>Thread</c>s in subgroups should be
-        recursively copied as well</param>
         <param name="list">an array into which to put the list of threads</param>
+        <param name="recurse">if <c>true</c>, recursively enumerate all subgroups of this
+                    thread group</param>
         <summary>Copies into the specified array every active thread in this
-            thread group and its subgroups.</summary>
+            thread group.</summary>
         <returns>the number of threads put into the array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#enumerate(java.lang.Thread[])" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.enumerate(java.lang.Thread[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#enumerate(java.lang.Thread[],%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.enumerate(java.lang.Thread[], boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -565,16 +565,15 @@
         <Parameter Name="recurse" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="recurse">indicates whether <c>ThreadGroup</c>s in subgroups should be
-        recursively copied as well or not</param>
-        <param name="list">an array into which to put the list of threads</param>
-        <summary>Copies into the specified array every active thread in this
-            thread group and its subgroups.</summary>
-        <returns>the number of threads put into the array</returns>
+        <param name="list">an array into which to put the list of thread groups</param>
+        <param name="recurse">if <c>true</c>, recursively enumerate all subgroups</param>
+        <summary>Copies into the specified array references to every active
+            subgroup in this thread group.</summary>
+        <returns>the number of thread groups put into the array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#enumerate(java.lang.Thread[])" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.enumerate(java.lang.Thread[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/ThreadGroup#enumerate(java.lang.ThreadGroup[],%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.ThreadGroup.enumerate(java.lang.ThreadGroup[], boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/Throwable.xml b/docs/Mono.Android/en/Java.Lang/Throwable.xml
index b244c8f30c..2774b104ba 100644
--- a/docs/Mono.Android/en/Java.Lang/Throwable.xml
+++ b/docs/Mono.Android/en/Java.Lang/Throwable.xml
@@ -101,12 +101,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new throwable with <c>null</c> as its detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new throwable with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable()" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,12 +143,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new throwable with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message. The detail message is saved for
+                     later retrieval by the <c>#getMessage()</c> method.</param>
+        <summary>Constructs a new throwable with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable()" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -199,13 +205,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a new throwable with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new throwable with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable()" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -240,15 +251,19 @@
         <Parameter Name="writableStackTrace" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <param name="enableSuppression">To be added.</param>
-        <param name="writableStackTrace">To be added.</param>
-        <summary>Constructs a new throwable with <c>null</c> as its detail message.</summary>
+        <param name="message">the detail message.</param>
+        <param name="cause">the cause.  (A <c>null</c> value is permitted,
+            and indicates that the cause is nonexistent or unknown.)</param>
+        <param name="enableSuppression">whether or not suppression is enabled or disabled</param>
+        <param name="writableStackTrace">whether or not the stack trace should be
+                                      writable</param>
+        <summary>Constructs a new throwable with the specified detail message,
+            cause, #addSuppressed suppression enabled or
+            disabled, and writable stack trace enabled or disabled.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable()" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Throwable#Throwable(java.lang.String,%20java.lang.Throwable,%20boolean,%20boolean)" title="Reference documentation">Java documentation for <code>java.lang.Throwable.Throwable(java.lang.String, java.lang.Throwable, boolean, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1106,13 +1121,13 @@
         <Parameter Name="s" Type="Java.IO.PrintStream" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Prints this throwable and its backtrace to the
-            standard error stream.</summary>
+        <param name="s">
+          <c>PrintStream</c> to use for output</param>
+        <summary>Prints this throwable and its backtrace to the specified print stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Throwable#printStackTrace()" title="Reference documentation">Java documentation for <code>java.lang.Throwable.printStackTrace()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Throwable#printStackTrace(java.io.PrintStream)" title="Reference documentation">Java documentation for <code>java.lang.Throwable.printStackTrace(java.io.PrintStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -1147,13 +1162,14 @@
         <Parameter Name="s" Type="Java.IO.PrintWriter" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Prints this throwable and its backtrace to the
-            standard error stream.</summary>
+        <param name="s">
+          <c>PrintWriter</c> to use for output</param>
+        <summary>Prints this throwable and its backtrace to the specified
+            print writer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/Throwable#printStackTrace()" title="Reference documentation">Java documentation for <code>java.lang.Throwable.printStackTrace()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/Throwable#printStackTrace(java.io.PrintWriter)" title="Reference documentation">Java documentation for <code>java.lang.Throwable.printStackTrace(java.io.PrintWriter)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/UnknownError.xml b/docs/Mono.Android/en/Java.Lang/UnknownError.xml
index c3d8677c0a..18b8fbb0d2 100644
--- a/docs/Mono.Android/en/Java.Lang/UnknownError.xml
+++ b/docs/Mono.Android/en/Java.Lang/UnknownError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;UnknownError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;UnknownError&lt;/code&gt; with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/UnknownError#UnknownError()" title="Reference documentation">Java documentation for <code>java.lang.UnknownError.UnknownError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/UnknownError#UnknownError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.UnknownError.UnknownError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml b/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml
index 051ebdf287..86fc38b3b3 100644
--- a/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml
+++ b/docs/Mono.Android/en/Java.Lang/UnsatisfiedLinkError.xml
@@ -88,12 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;UnsatisfiedLinkError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;UnsatisfiedLinkError&lt;/code&gt; with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/UnsatisfiedLinkError#UnsatisfiedLinkError()" title="Reference documentation">Java documentation for <code>java.lang.UnsatisfiedLinkError.UnsatisfiedLinkError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/UnsatisfiedLinkError#UnsatisfiedLinkError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.UnsatisfiedLinkError.UnsatisfiedLinkError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml b/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml
index 02a327c9cc..cfdcbbc9ca 100644
--- a/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml
+++ b/docs/Mono.Android/en/Java.Lang/UnsupportedClassVersionError.xml
@@ -90,13 +90,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;UnsupportedClassVersionError&lt;/code&gt;
-            with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;UnsupportedClassVersionError&lt;/code&gt; with
+            the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/UnsupportedClassVersionError#UnsupportedClassVersionError()" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedClassVersionError.UnsupportedClassVersionError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/UnsupportedClassVersionError#UnsupportedClassVersionError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedClassVersionError.UnsupportedClassVersionError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/UnsupportedOperationException.xml b/docs/Mono.Android/en/Java.Lang/UnsupportedOperationException.xml
index 0cd88e4b22..4ef90e6580 100644
--- a/docs/Mono.Android/en/Java.Lang/UnsupportedOperationException.xml
+++ b/docs/Mono.Android/en/Java.Lang/UnsupportedOperationException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an UnsupportedOperationException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/UnsupportedOperationException#UnsupportedOperationException()" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedOperationException.UnsupportedOperationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/UnsupportedOperationException#UnsupportedOperationException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedOperationException.UnsupportedOperationException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs an UnsupportedOperationException with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <summary>Constructs an UnsupportedOperationException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/UnsupportedOperationException#UnsupportedOperationException()" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedOperationException.UnsupportedOperationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/UnsupportedOperationException#UnsupportedOperationException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedOperationException.UnsupportedOperationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an UnsupportedOperationException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>Throwable#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value
+                    is permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/UnsupportedOperationException#UnsupportedOperationException()" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedOperationException.UnsupportedOperationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/UnsupportedOperationException#UnsupportedOperationException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.UnsupportedOperationException.UnsupportedOperationException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/VerifyError.xml b/docs/Mono.Android/en/Java.Lang/VerifyError.xml
index 8b937a4ea7..e47ff3c2d1 100644
--- a/docs/Mono.Android/en/Java.Lang/VerifyError.xml
+++ b/docs/Mono.Android/en/Java.Lang/VerifyError.xml
@@ -89,12 +89,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;VerifyError&lt;/code&gt; with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;VerifyError&lt;/code&gt; with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/VerifyError#VerifyError()" title="Reference documentation">Java documentation for <code>java.lang.VerifyError.VerifyError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/VerifyError#VerifyError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.VerifyError.VerifyError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml b/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml
index 676bf36e85..9d9ab7b30a 100644
--- a/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml
+++ b/docs/Mono.Android/en/Java.Lang/VirtualMachineError.xml
@@ -88,12 +88,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;VirtualMachineError&lt;/code&gt; with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs an a <c>VirtualMachineError</c> with the specified
+            cause and a detail message of <c>(cause==null ? null :
+            cause.toString())</c> (which typically contains the class and
+            detail message of <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/VirtualMachineError#VirtualMachineError()" title="Reference documentation">Java documentation for <code>java.lang.VirtualMachineError.VirtualMachineError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/VirtualMachineError#VirtualMachineError(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.VirtualMachineError.VirtualMachineError(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +130,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a &lt;code&gt;VirtualMachineError&lt;/code&gt; with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;VirtualMachineError&lt;/code&gt; with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/VirtualMachineError#VirtualMachineError()" title="Reference documentation">Java documentation for <code>java.lang.VirtualMachineError.VirtualMachineError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/VirtualMachineError#VirtualMachineError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.lang.VirtualMachineError.VirtualMachineError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +192,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;VirtualMachineError&lt;/code&gt; with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a <c>VirtualMachineError</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/lang/VirtualMachineError#VirtualMachineError()" title="Reference documentation">Java documentation for <code>java.lang.VirtualMachineError.VirtualMachineError()</code>.</a>
+              <a href="https://developer.android.com/reference/java/lang/VirtualMachineError#VirtualMachineError(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.lang.VirtualMachineError.VirtualMachineError(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Math/BigDecimal.xml b/docs/Mono.Android/en/Java.Math/BigDecimal.xml
index c770362316..cc928de422 100644
--- a/docs/Mono.Android/en/Java.Math/BigDecimal.xml
+++ b/docs/Mono.Android/en/Java.Math/BigDecimal.xml
@@ -71,15 +71,13 @@
       </Parameters>
       <Docs>
         <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+          <c>BigInteger</c> value to be converted to
+                       <c>BigDecimal</c>.</param>
+        <summary>Translates a <c>BigInteger</c> into a <c>BigDecimal</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(java.math.BigInteger)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(java.math.BigInteger)</code>.</a>
             </format>
           </para>
           <para>
@@ -111,17 +109,16 @@
         <Parameter Name="in" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="in">
+          <c>char</c> array that is the source of characters.</param>
+        <summary>Translates a character array representation of a
+            <c>BigDecimal</c> into a <c>BigDecimal</c>, accepting the
+            same sequence of characters as the <c>#BigDecimal(String)</c>
+            constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(char[])" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -200,15 +197,13 @@
       </Parameters>
       <Docs>
         <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+          <c>int</c> value to be converted to
+                       <c>BigDecimal</c>.</param>
+        <summary>Translates an <c>int</c> into a <c>BigDecimal</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -241,15 +236,12 @@
       </Parameters>
       <Docs>
         <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+          <c>long</c> value to be converted to <c>BigDecimal</c>.</param>
+        <summary>Translates a <c>long</c> into a <c>BigDecimal</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(long)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -281,16 +273,13 @@
         <Parameter Name="val" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="val">String representation of <c>BigDecimal</c>.</param>
+        <summary>Translates the string representation of a <c>BigDecimal</c>
+            into a <c>BigDecimal</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(java.lang.String)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -326,17 +315,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">To be added.</param>
         <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+          <c>BigInteger</c> value to be converted to
+                       <c>BigDecimal</c>.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates a <c>BigInteger</c> into a <c>BigDecimal</c>
+            rounding according to the context settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(java.math.BigInteger,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(java.math.BigInteger, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -373,18 +361,14 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="unscaledVal">To be added.</param>
-        <param name="scale">To be added.</param>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="unscaledVal">unscaled value of the <c>BigDecimal</c>.</param>
+        <param name="scale">scale of the <c>BigDecimal</c>.</param>
+        <summary>Translates a <c>BigInteger</c> unscaled value and an
+            <c>int</c> scale into a <c>BigDecimal</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(java.math.BigInteger,%20int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(java.math.BigInteger, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -419,18 +403,18 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
-        <param name="mc">To be added.</param>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="in">
+          <c>char</c> array that is the source of characters.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates a character array representation of a
+            <c>BigDecimal</c> into a <c>BigDecimal</c>, accepting the
+            same sequence of characters as the <c>#BigDecimal(String)</c>
+            constructor and with rounding according to the context
+            settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(char[],%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(char[], java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -469,17 +453,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">To be added.</param>
         <param name="val">
           <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+                    <c>BigDecimal</c>.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates a <c>double</c> into a <c>BigDecimal</c>, with
+            rounding according to the context settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -517,17 +500,15 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">To be added.</param>
         <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+          <c>int</c> value to be converted to <c>BigDecimal</c>.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates an <c>int</c> into a <c>BigDecimal</c>, with
+            rounding according to the context settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(int,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(int, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -564,17 +545,15 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">To be added.</param>
         <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+          <c>long</c> value to be converted to <c>BigDecimal</c>.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates a <c>long</c> into a <c>BigDecimal</c>, with
+            rounding according to the context settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(long,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(long, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -634,17 +613,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">To be added.</param>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="val">string representation of a <c>BigDecimal</c>.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates the string representation of a <c>BigDecimal</c>
+            into a <c>BigDecimal</c>, accepting the same strings as the
+            <c>#BigDecimal(String)</c> constructor, with rounding
+            according to the context settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(java.lang.String,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(java.lang.String, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -684,19 +662,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="unscaledVal">To be added.</param>
-        <param name="scale">To be added.</param>
-        <param name="mc">To be added.</param>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="unscaledVal">unscaled value of the <c>BigDecimal</c>.</param>
+        <param name="scale">scale of the <c>BigDecimal</c>.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates a <c>BigInteger</c> unscaled value and an
+            <c>int</c> scale into a <c>BigDecimal</c>, with rounding
+            according to the context settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(java.math.BigInteger,%20int,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(java.math.BigInteger, int, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -735,19 +710,18 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="in">
+          <c>char</c> array that is the source of characters.</param>
+        <param name="offset">first character in the array to inspect.</param>
+        <param name="len">number of characters to consider.</param>
+        <summary>Translates a character array representation of a
+            <c>BigDecimal</c> into a <c>BigDecimal</c>, accepting the
+            same sequence of characters as the <c>#BigDecimal(String)</c>
+            constructor, while allowing a sub-array to be specified.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -785,20 +759,20 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="in">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="mc">To be added.</param>
-        <param name="val">
-          <c>double</c> value to be converted to
-                   <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c> which
-            is the exact decimal representation of the <c>double</c>'s
-            binary floating-point value.</summary>
+        <param name="in">
+          <c>char</c> array that is the source of characters.</param>
+        <param name="offset">first character in the array to inspect.</param>
+        <param name="len">number of characters to consider..</param>
+        <param name="mc">the context to use.</param>
+        <summary>Translates a character array representation of a
+            <c>BigDecimal</c> into a <c>BigDecimal</c>, accepting the
+            same sequence of characters as the <c>#BigDecimal(String)</c>
+            constructor, while allowing a sub-array to be specified and
+            with rounding according to the context settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#BigDecimal(char[],%20int,%20int,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.BigDecimal(char[], int, int, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -881,17 +855,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
+        <param name="mc">the context to use.</param>
         <summary>Returns a <c>BigDecimal</c> whose value is the absolute value
-            of this <c>BigDecimal</c>, and whose scale is
-            <c>this.scale()</c>.</summary>
+            of this <c>BigDecimal</c>, with rounding according to the
+            context settings.</summary>
         <returns>
-          <c>abs(this)</c>
-        </returns>
+          <c>abs(this)</c>, rounded as necessary.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#abs()" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.abs()</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#abs(java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.abs(java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -974,18 +947,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
         <param name="augend">value to be added to this <c>BigDecimal</c>.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this +
-            augend)</c>, and whose scale is <c>max(this.scale(),
-            augend.scale())</c>.</summary>
+        <param name="mc">the context to use.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this + augend)</c>,
+            with rounding according to the context settings.</summary>
         <returns>
-          <c>this + augend</c>
-        </returns>
+          <c>this + augend</c>, rounded as necessary.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#add(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.add(java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#add(java.math.BigDecimal,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.add(java.math.BigDecimal, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -1110,14 +1081,19 @@
         <Parameter Name="divisor" Type="Java.Math.BigDecimal" />
       </Parameters>
       <Docs>
-        <param name="divisor">value by which <c>this</c> is divided.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(xs /
-            ys)</c>, with rounding according to the context settings.</summary>
-        <returns>To be added.</returns>
+        <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this /
+            divisor)</c>, and whose preferred scale is <c>(this.scale() -
+            divisor.scale())</c>; if the exact quotient cannot be
+            represented (because it has a non-terminating decimal
+            expansion) an <c>ArithmeticException</c> is thrown.</summary>
+        <returns>
+          <c>this / divisor</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(long,%20int,%20long,%20int,%20long,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(long, int, long, int, long, java.math.MathContext)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(java.math.BigDecimal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1157,15 +1133,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="divisor">value by which <c>this</c> is divided.</param>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(xs /
-            ys)</c>, with rounding according to the context settings.</summary>
-        <returns>To be added.</returns>
+        <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
+        <param name="mc">the context to use.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this /
+            divisor)</c>, with rounding according to the context settings.</summary>
+        <returns>
+          <c>this / divisor</c>, rounded as necessary.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(long,%20int,%20long,%20int,%20long,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(long, int, long, int, long, java.math.MathContext)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(java.math.BigDecimal,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(java.math.BigDecimal, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -1206,15 +1183,17 @@
         <Parameter Name="roundingMode" Type="Java.Math.RoundingMode" />
       </Parameters>
       <Docs>
-        <param name="divisor">value by which <c>this</c> is divided.</param>
-        <param name="roundingMode">rounding mode to be used to round the result.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(xs /
-            ys)</c>, with rounding according to the context settings.</summary>
-        <returns>To be added.</returns>
+        <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
+        <param name="roundingMode">rounding mode to apply.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this /
+            divisor)</c>, and whose scale is <c>this.scale()</c>.</summary>
+        <returns>
+          <c>this / divisor</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(long,%20int,%20long,%20int,%20long,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(long, int, long, int, long, java.math.MathContext)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(java.math.BigDecimal,%20java.math.RoundingMode)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(java.math.BigDecimal, java.math.RoundingMode)</code>.</a>
             </format>
           </para>
           <para>
@@ -1255,15 +1234,17 @@
         <Parameter Name="roundingMode" Type="Java.Math.RoundOptions" />
       </Parameters>
       <Docs>
-        <param name="divisor">value by which <c>this</c> is divided.</param>
-        <param name="roundingMode">rounding mode to be used to round the result.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(xs /
-            ys)</c>, with rounding according to the context settings.</summary>
-        <returns>To be added.</returns>
+        <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
+        <param name="roundingMode">rounding mode to apply.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this /
+            divisor)</c>, and whose scale is <c>this.scale()</c>.</summary>
+        <returns>
+          <c>this / divisor</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(long,%20int,%20long,%20int,%20long,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(long, int, long, int, long, java.math.MathContext)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(java.math.BigDecimal,%20int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(java.math.BigDecimal, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1306,16 +1287,18 @@
         <Parameter Name="roundingMode" Type="Java.Math.RoundingMode" />
       </Parameters>
       <Docs>
-        <param name="divisor">value by which <c>this</c> is divided.</param>
-        <param name="scale">the scale of the result returned.</param>
-        <param name="roundingMode">rounding mode to be used to round the result.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(xs /
-            ys)</c>, with rounding according to the context settings.</summary>
-        <returns>To be added.</returns>
+        <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
+        <param name="scale">scale of the <c>BigDecimal</c> quotient to be returned.</param>
+        <param name="roundingMode">rounding mode to apply.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this /
+            divisor)</c>, and whose scale is as specified.</summary>
+        <returns>
+          <c>this / divisor</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(long,%20int,%20long,%20int,%20long,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(long, int, long, int, long, java.math.MathContext)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(java.math.BigDecimal,%20int,%20java.math.RoundingMode)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(java.math.BigDecimal, int, java.math.RoundingMode)</code>.</a>
             </format>
           </para>
           <para>
@@ -1358,16 +1341,18 @@
         <Parameter Name="roundingMode" Type="Java.Math.RoundOptions" />
       </Parameters>
       <Docs>
-        <param name="divisor">value by which <c>this</c> is divided.</param>
-        <param name="scale">the scale of the result returned.</param>
-        <param name="roundingMode">rounding mode to be used to round the result.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(xs /
-            ys)</c>, with rounding according to the context settings.</summary>
-        <returns>To be added.</returns>
+        <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
+        <param name="scale">scale of the <c>BigDecimal</c> quotient to be returned.</param>
+        <param name="roundingMode">rounding mode to apply.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this /
+            divisor)</c>, and whose scale is as specified.</summary>
+        <returns>
+          <c>this / divisor</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(long,%20int,%20long,%20int,%20long,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(long, int, long, int, long, java.math.MathContext)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divide(java.math.BigDecimal,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divide(java.math.BigDecimal, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1459,20 +1444,20 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">math context which determines the maximal precision of the
-            result.</param>
         <param name="divisor">value by which this <c>BigDecimal</c> is to be divided,
                     and the remainder computed.</param>
+        <param name="mc">the context to use.</param>
         <summary>Returns a two-element <c>BigDecimal</c> array containing the
             result of <c>divideToIntegralValue</c> followed by the result of
-            <c>remainder</c> on the two operands.</summary>
+            <c>remainder</c> on the two operands calculated with rounding
+            according to the context settings.</summary>
         <returns>a two element <c>BigDecimal</c> array: the quotient
-                    (the result of <c>divideToIntegralValue</c>) is the initial element
-                    and the remainder is the final element.</returns>
+                    (the result of <c>divideToIntegralValue</c>) is the
+                    initial element and the remainder is the final element.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divideAndRemainder(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divideAndRemainder(java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divideAndRemainder(java.math.BigDecimal,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divideAndRemainder(java.math.BigDecimal, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -1557,16 +1542,15 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">math context which determines the maximal precision of the
-            result.</param>
         <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
+        <param name="mc">the context to use.</param>
         <summary>Returns a <c>BigDecimal</c> whose value is the integer part
-            of the quotient <c>(this / divisor)</c> rounded down.</summary>
+            of <c>(this / divisor)</c>.</summary>
         <returns>The integer part of <c>this / divisor</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#divideToIntegralValue(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divideToIntegralValue(java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#divideToIntegralValue(java.math.BigDecimal,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.divideToIntegralValue(java.math.BigDecimal, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -2129,18 +2113,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
         <param name="multiplicand">value to be multiplied by this <c>BigDecimal</c>.</param>
+        <param name="mc">the context to use.</param>
         <summary>Returns a <c>BigDecimal</c> whose value is <c>(this &amp;times;
-            multiplicand)</c>, and whose scale is <c>(this.scale() +
-            multiplicand.scale())</c>.</summary>
+            multiplicand)</c>, with rounding according to the context settings.</summary>
         <returns>
-          <c>this * multiplicand</c>
-        </returns>
+          <c>this * multiplicand</c>, rounded as necessary.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#multiply(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.multiply(java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#multiply(java.math.BigDecimal,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.multiply(java.math.BigDecimal, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -2217,15 +2199,15 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
+        <param name="mc">the context to use.</param>
         <summary>Returns a <c>BigDecimal</c> whose value is <c>(-this)</c>,
-            and whose scale is <c>this.scale()</c>.</summary>
+            with rounding according to the context settings.</summary>
         <returns>
-          <c>-this</c>.</returns>
+          <c>-this</c>, rounded as necessary.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#negate()" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.negate()</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#negate(java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.negate(java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -2337,15 +2319,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(+this)</c>, and whose
-            scale is <c>this.scale()</c>.</summary>
+        <param name="mc">the context to use.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(+this)</c>,
+            with rounding according to the context settings.</summary>
         <returns>
-          <c>this</c>.</returns>
+          <c>this</c>, rounded as necessary.  A zero result will
+                    have a scale of 0.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#plus()" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.plus()</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#plus(java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.plus(java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -2428,18 +2411,17 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
         <param name="n">power to raise this <c>BigDecimal</c> to.</param>
+        <param name="mc">the context to use.</param>
         <summary>Returns a <c>BigDecimal</c> whose value is
-            <c>(this&lt;sup&gt;n&lt;/sup&gt;)</c>, The power is computed exactly, to
-            unlimited precision.</summary>
+            <c>(this&lt;sup&gt;n&lt;/sup&gt;)</c>.</summary>
         <returns>
-          <c>this&lt;sup&gt;n&lt;/sup&gt;</c>
-        </returns>
+          <c>this&lt;sup&gt;n&lt;/sup&gt;</c> using the ANSI standard X3.274-1996
+                    algorithm</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#pow(int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.pow(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#pow(int,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.pow(int, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -2560,15 +2542,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision to be used.</param>
         <param name="divisor">value by which this <c>BigDecimal</c> is to be divided.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this % divisor)</c>.</summary>
+        <param name="mc">the context to use.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this %
+            divisor)</c>, with rounding according to the context settings.</summary>
         <returns>
-          <c>this % divisor</c>.</returns>
+          <c>this % divisor</c>, rounded as necessary.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#remainder(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.remainder(java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#remainder(java.math.BigDecimal,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.remainder(java.math.BigDecimal, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -3127,19 +3110,20 @@
         <Parameter Name="roundingMode" Type="Java.Math.RoundingMode" />
       </Parameters>
       <Docs>
-        <param name="roundingMode">rounding mode to be used to round the result.</param>
         <param name="newScale">scale of the <c>BigDecimal</c> value to be returned.</param>
+        <param name="roundingMode">The rounding mode to apply.</param>
         <summary>Returns a <c>BigDecimal</c> whose scale is the specified
-            value, and whose value is numerically equal to this
-            <c>BigDecimal</c>'s.</summary>
-        <returns>a <c>BigDecimal</c> whose scale is the specified value, and
-                    whose unscaled value is determined by multiplying or dividing
-                    this <c>BigDecimal</c>'s unscaled value by the appropriate
-                    power of ten to maintain its overall value.</returns>
+            value, and whose unscaled value is determined by multiplying or
+            dividing this <c>BigDecimal</c>'s unscaled value by the
+            appropriate power of ten to maintain its overall value.</summary>
+        <returns>a <c>BigDecimal</c> whose scale is the specified value,
+                    and whose unscaled value is determined by multiplying or
+                    dividing this <c>BigDecimal</c>'s unscaled value by the
+                    appropriate power of ten to maintain its overall value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#setScale(int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.setScale(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#setScale(int,%20java.math.RoundingMode)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.setScale(int, java.math.RoundingMode)</code>.</a>
             </format>
           </para>
           <para>
@@ -3179,19 +3163,20 @@
         <Parameter Name="roundingMode" Type="Java.Math.RoundOptions" />
       </Parameters>
       <Docs>
-        <param name="roundingMode">rounding mode to be used to round the result.</param>
         <param name="newScale">scale of the <c>BigDecimal</c> value to be returned.</param>
+        <param name="roundingMode">The rounding mode to apply.</param>
         <summary>Returns a <c>BigDecimal</c> whose scale is the specified
-            value, and whose value is numerically equal to this
-            <c>BigDecimal</c>'s.</summary>
-        <returns>a <c>BigDecimal</c> whose scale is the specified value, and
-                    whose unscaled value is determined by multiplying or dividing
-                    this <c>BigDecimal</c>'s unscaled value by the appropriate
-                    power of ten to maintain its overall value.</returns>
+            value, and whose unscaled value is determined by multiplying or
+            dividing this <c>BigDecimal</c>'s unscaled value by the
+            appropriate power of ten to maintain its overall value.</summary>
+        <returns>a <c>BigDecimal</c> whose scale is the specified value,
+                    and whose unscaled value is determined by multiplying or
+                    dividing this <c>BigDecimal</c>'s unscaled value by the
+                    appropriate power of ten to maintain its overall value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#setScale(int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.setScale(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#setScale(int,%20int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.setScale(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3399,18 +3384,16 @@
         <Parameter Name="mc" Type="Java.Math.MathContext" />
       </Parameters>
       <Docs>
-        <param name="mc">rounding mode and precision for the result of this operation.</param>
         <param name="subtrahend">value to be subtracted from this <c>BigDecimal</c>.</param>
-        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this -
-            subtrahend)</c>, and whose scale is <c>max(this.scale(),
-            subtrahend.scale())</c>.</summary>
+        <param name="mc">the context to use.</param>
+        <summary>Returns a <c>BigDecimal</c> whose value is <c>(this - subtrahend)</c>,
+            with rounding according to the context settings.</summary>
         <returns>
-          <c>this - subtrahend</c>
-        </returns>
+          <c>this - subtrahend</c>, rounded as necessary.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#subtract(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.subtract(java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#subtract(java.math.BigDecimal,%20java.math.MathContext)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.subtract(java.math.BigDecimal, java.math.MathContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -3830,17 +3813,14 @@
         <Parameter Name="val" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="val">
-          <c>double</c> to convert to a <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c>, using
-            the <c>double</c>'s canonical string representation provided
-            by the <c>Double#toString(double)</c> method.</summary>
-        <returns>a <c>BigDecimal</c> whose value is equal to or approximately
-                    equal to the value of <c>val</c>.</returns>
+        <param name="val">value of the <c>BigDecimal</c>.</param>
+        <summary>Translates a <c>long</c> value into a <c>BigDecimal</c>
+            with a scale of zero.</summary>
+        <returns>a <c>BigDecimal</c> whose value is <c>val</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#valueOf(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.valueOf(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#valueOf(long)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.valueOf(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3876,19 +3856,16 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="unscaledVal">To be added.</param>
-        <param name="scale">To be added.</param>
-        <param name="val">
-          <c>double</c> to convert to a <c>BigDecimal</c>.</param>
-        <summary>Translates a <c>double</c> into a <c>BigDecimal</c>, using
-            the <c>double</c>'s canonical string representation provided
-            by the <c>Double#toString(double)</c> method.</summary>
-        <returns>a <c>BigDecimal</c> whose value is equal to or approximately
-                    equal to the value of <c>val</c>.</returns>
+        <param name="unscaledVal">unscaled value of the <c>BigDecimal</c>.</param>
+        <param name="scale">scale of the <c>BigDecimal</c>.</param>
+        <summary>Translates a <c>long</c> unscaled value and an
+            <c>int</c> scale into a <c>BigDecimal</c>.</summary>
+        <returns>a <c>BigDecimal</c> whose value is
+                    <c>(unscaledVal &amp;times; 10&lt;sup&gt;-scale&lt;/sup&gt;)</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigDecimal#valueOf(double)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.valueOf(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigDecimal#valueOf(long,%20int)" title="Reference documentation">Java documentation for <code>java.math.BigDecimal.valueOf(long, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Math/BigInteger.xml b/docs/Mono.Android/en/Java.Math/BigInteger.xml
index f3557320dc..1a0b982ad8 100644
--- a/docs/Mono.Android/en/Java.Math/BigInteger.xml
+++ b/docs/Mono.Android/en/Java.Math/BigInteger.xml
@@ -70,21 +70,14 @@
         <Parameter Name="val" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
-        <param name="bitLength">bitLength of the returned BigInteger.</param>
-        <param name="certainty">a measure of the uncertainty that the caller is
-                    willing to tolerate.  The probability that the new BigInteger
-                    represents a prime number will exceed
-                    (1 - 1/2&lt;sup&gt;<c>certainty</c>&lt;/sup&gt;).  The execution time of
-                    this constructor is proportional to the value of this parameter.</param>
-        <param name="rnd">source of random bits used to select candidates to be
-                    tested for primality.</param>
-        <summary>Constructs a randomly generated positive BigInteger that is probably
-            prime, with the specified bitLength.</summary>
+        <param name="val">big-endian two's-complement binary representation of
+                    BigInteger.</param>
+        <summary>Translates a byte array containing the two's-complement binary
+            representation of a BigInteger into a BigInteger.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(int,%20int,%20java.util.Random)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(int, int, java.util.Random)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(byte[])" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -119,21 +112,13 @@
         <Parameter Name="val" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
-        <param name="bitLength">bitLength of the returned BigInteger.</param>
-        <param name="certainty">a measure of the uncertainty that the caller is
-                    willing to tolerate.  The probability that the new BigInteger
-                    represents a prime number will exceed
-                    (1 - 1/2&lt;sup&gt;<c>certainty</c>&lt;/sup&gt;).  The execution time of
-                    this constructor is proportional to the value of this parameter.</param>
-        <param name="rnd">source of random bits used to select candidates to be
-                    tested for primality.</param>
-        <summary>Constructs a randomly generated positive BigInteger that is probably
-            prime, with the specified bitLength.</summary>
+        <param name="val">decimal String representation of BigInteger.</param>
+        <summary>Translates the decimal String representation of a BigInteger into a
+            BigInteger.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(int,%20int,%20java.util.Random)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(int, int, java.util.Random)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(java.lang.String)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -170,21 +155,15 @@
         <Parameter Name="rnd" Type="Java.Util.Random" />
       </Parameters>
       <Docs>
-        <param name="numBits">To be added.</param>
-        <param name="bitLength">bitLength of the returned BigInteger.</param>
-        <param name="certainty">a measure of the uncertainty that the caller is
-                    willing to tolerate.  The probability that the new BigInteger
-                    represents a prime number will exceed
-                    (1 - 1/2&lt;sup&gt;<c>certainty</c>&lt;/sup&gt;).  The execution time of
-                    this constructor is proportional to the value of this parameter.</param>
-        <param name="rnd">source of random bits used to select candidates to be
-                    tested for primality.</param>
-        <summary>Constructs a randomly generated positive BigInteger that is probably
-            prime, with the specified bitLength.</summary>
+        <param name="numBits">maximum bitLength of the new BigInteger.</param>
+        <param name="rnd">source of randomness to be used in computing the new
+                    BigInteger.</param>
+        <summary>Constructs a randomly generated BigInteger, uniformly distributed over
+            the range 0 to (2&lt;sup&gt;<c>numBits</c>&lt;/sup&gt; - 1), inclusive.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(int,%20int,%20java.util.Random)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(int, int, java.util.Random)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(int,%20java.util.Random)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(int, java.util.Random)</code>.</a>
             </format>
           </para>
           <para>
@@ -218,22 +197,16 @@
         <Parameter Name="magnitude" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="signum">To be added.</param>
-        <param name="magnitude">To be added.</param>
-        <param name="bitLength">bitLength of the returned BigInteger.</param>
-        <param name="certainty">a measure of the uncertainty that the caller is
-                    willing to tolerate.  The probability that the new BigInteger
-                    represents a prime number will exceed
-                    (1 - 1/2&lt;sup&gt;<c>certainty</c>&lt;/sup&gt;).  The execution time of
-                    this constructor is proportional to the value of this parameter.</param>
-        <param name="rnd">source of random bits used to select candidates to be
-                    tested for primality.</param>
-        <summary>Constructs a randomly generated positive BigInteger that is probably
-            prime, with the specified bitLength.</summary>
+        <param name="signum">signum of the number (-1 for negative, 0 for zero, 1
+                    for positive).</param>
+        <param name="magnitude">big-endian binary representation of the magnitude of
+                    the number.</param>
+        <summary>Translates the sign-magnitude representation of a BigInteger into a
+            BigInteger.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(int,%20int,%20java.util.Random)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(int, int, java.util.Random)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(int,%20byte[])" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -293,22 +266,14 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
-        <param name="radix">To be added.</param>
-        <param name="bitLength">bitLength of the returned BigInteger.</param>
-        <param name="certainty">a measure of the uncertainty that the caller is
-                    willing to tolerate.  The probability that the new BigInteger
-                    represents a prime number will exceed
-                    (1 - 1/2&lt;sup&gt;<c>certainty</c>&lt;/sup&gt;).  The execution time of
-                    this constructor is proportional to the value of this parameter.</param>
-        <param name="rnd">source of random bits used to select candidates to be
-                    tested for primality.</param>
-        <summary>Constructs a randomly generated positive BigInteger that is probably
-            prime, with the specified bitLength.</summary>
+        <param name="val">String representation of BigInteger.</param>
+        <param name="radix">radix to be used in interpreting <c>val</c>.</param>
+        <summary>Translates the String representation of a BigInteger in the
+            specified radix into a BigInteger.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(int,%20int,%20java.util.Random)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(int, int, java.util.Random)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#BigInteger(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.BigInteger(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -436,14 +401,15 @@
         <Parameter Name="val" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
-        <summary>Package private methods used by BigDecimal code to add a BigInteger
-            with a long.</summary>
-        <returns>To be added.</returns>
+        <param name="val">value to be added to this BigInteger.</param>
+        <summary>Returns a BigInteger whose value is <c>(this + val)</c>.</summary>
+        <returns>
+          <c>this + val</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#add(long)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.add(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#add(java.math.BigInteger)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.add(java.math.BigInteger)</code>.</a>
             </format>
           </para>
           <para>
@@ -1568,14 +1534,15 @@
         <Parameter Name="val" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
-        <summary>Package private methods used by BigDecimal code to multiply a BigInteger
-            with a long.</summary>
-        <returns>To be added.</returns>
+        <param name="val">value to be multiplied by this BigInteger.</param>
+        <summary>Returns a BigInteger whose value is <c>(this * val)</c>.</summary>
+        <returns>
+          <c>this * val</c>
+        </returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#multiply(long)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.multiply(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#multiply(java.math.BigInteger)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.multiply(java.math.BigInteger)</code>.</a>
             </format>
           </para>
           <para>
@@ -2390,14 +2357,14 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">base to be used for the string representation.
-</param>
-        <summary>Returns the decimal String representation of this BigInteger.</summary>
-        <returns>decimal String representation of this BigInteger.</returns>
+        <param name="radix">radix of the String representation.</param>
+        <summary>Returns the String representation of this BigInteger in the
+            given radix.</summary>
+        <returns>String representation of this BigInteger in the given radix.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/BigInteger#toString()" title="Reference documentation">Java documentation for <code>java.math.BigInteger.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/BigInteger#toString(int)" title="Reference documentation">Java documentation for <code>java.math.BigInteger.toString(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Math/MathContext.xml b/docs/Mono.Android/en/Java.Math/MathContext.xml
index db9dd8a3b4..3d664c5007 100644
--- a/docs/Mono.Android/en/Java.Math/MathContext.xml
+++ b/docs/Mono.Android/en/Java.Math/MathContext.xml
@@ -110,15 +110,12 @@
         <Parameter Name="val" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="val">To be added.</param>
-        <param name="setPrecision">The non-negative <c>int</c> precision setting.</param>
-        <summary>Constructs a new <c>MathContext</c> with the specified
-            precision and the <c>RoundingMode#HALF_UP HALF_UP</c> rounding
-            mode.</summary>
+        <param name="val">The string to be parsed</param>
+        <summary>Constructs a new <c>MathContext</c> from a string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/MathContext#MathContext(int)" title="Reference documentation">Java documentation for <code>java.math.MathContext.MathContext(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/MathContext#MathContext(java.lang.String)" title="Reference documentation">Java documentation for <code>java.math.MathContext.MathContext(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,15 +150,14 @@
         <Parameter Name="setRoundingMode" Type="Java.Math.RoundingMode" />
       </Parameters>
       <Docs>
-        <param name="setRoundingMode">To be added.</param>
         <param name="setPrecision">The non-negative <c>int</c> precision setting.</param>
-        <summary>Constructs a new <c>MathContext</c> with the specified
-            precision and the <c>RoundingMode#HALF_UP HALF_UP</c> rounding
-            mode.</summary>
+        <param name="setRoundingMode">The rounding mode to use.</param>
+        <summary>Constructs a new <c>MathContext</c> with a specified
+            precision and rounding mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/math/MathContext#MathContext(int)" title="Reference documentation">Java documentation for <code>java.math.MathContext.MathContext(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/math/MathContext#MathContext(int,%20java.math.RoundingMode)" title="Reference documentation">Java documentation for <code>java.math.MathContext.MathContext(int, java.math.RoundingMode)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Math/RoundingMode.xml b/docs/Mono.Android/en/Java.Math/RoundingMode.xml
index 3682ade338..49b11cebcd 100644
--- a/docs/Mono.Android/en/Java.Math/RoundingMode.xml
+++ b/docs/Mono.Android/en/Java.Math/RoundingMode.xml
@@ -430,7 +430,6 @@
       </Parameters>
       <Docs>
         <param name="name">To be added.</param>
-        <param name="rm">legacy integer rounding mode to convert</param>
         <summary>Returns the <c>RoundingMode</c> object corresponding to a
             legacy integer rounding mode constant in <c>BigDecimal</c>.</summary>
         <returns>
diff --git a/docs/Mono.Android/en/Java.Net/Authenticator.xml b/docs/Mono.Android/en/Java.Net/Authenticator.xml
index f893cb4c34..07db56ad7f 100644
--- a/docs/Mono.Android/en/Java.Net/Authenticator.xml
+++ b/docs/Mono.Android/en/Java.Net/Authenticator.xml
@@ -487,13 +487,12 @@
         <Parameter Name="scheme" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="host">The hostname of the site requesting authentication.</param>
-        <param name="addr">The InetAddress of the site requesting authentication,
+        <param name="addr">The InetAddress of the site requesting authorization,
                         or null if not known.</param>
-        <param name="port">the port for the requested connection.</param>
+        <param name="port">the port for the requested connection</param>
         <param name="protocol">The protocol that's requesting the connection
                      (<c>java.net.Authenticator#getRequestingProtocol()</c>)</param>
-        <param name="prompt">A prompt string for the user which identifies the authentication realm.</param>
+        <param name="prompt">A prompt string for the user</param>
         <param name="scheme">The authentication scheme</param>
         <summary>Ask the authenticator that has been registered with the system
             for a password.</summary>
@@ -501,7 +500,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Authenticator#requestPasswordAuthentication(java.lang.String,%20java.net.InetAddress,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.Authenticator.requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Authenticator#requestPasswordAuthentication(java.net.InetAddress,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.Authenticator.requestPasswordAuthentication(java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -597,9 +596,6 @@
         <Parameter Name="reqType" Type="Java.Net.Authenticator+RequestorType" />
       </Parameters>
       <Docs>
-        <param name="url">To be added.</param>
-        <param name="reqType">requestor type of the connection that requests authentication.
-</param>
         <param name="host">The hostname of the site requesting authentication.</param>
         <param name="addr">The InetAddress of the site requesting authentication,
                         or null if not known.</param>
@@ -608,6 +604,9 @@
                      (<c>java.net.Authenticator#getRequestingProtocol()</c>)</param>
         <param name="prompt">A prompt string for the user which identifies the authentication realm.</param>
         <param name="scheme">The authentication scheme</param>
+        <param name="url">To be added.</param>
+        <param name="reqType">requestor type of the connection that requests authentication.
+</param>
         <summary>Ask the authenticator that has been registered with the system
             for a password.</summary>
         <returns>The username/password, or null if one can't be gotten.</returns>
diff --git a/docs/Mono.Android/en/Java.Net/BindException.xml b/docs/Mono.Android/en/Java.Net/BindException.xml
index 4f7e71386a..7b7277c061 100644
--- a/docs/Mono.Android/en/Java.Net/BindException.xml
+++ b/docs/Mono.Android/en/Java.Net/BindException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Construct a new BindException with no detailed message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Constructs a new BindException with the specified detail
+            message as to why the bind error occurred.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/BindException#BindException()" title="Reference documentation">Java documentation for <code>java.net.BindException.BindException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/BindException#BindException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.BindException.BindException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/ConnectException.xml b/docs/Mono.Android/en/Java.Net/ConnectException.xml
index e3a6b1f14c..1182a1f48f 100644
--- a/docs/Mono.Android/en/Java.Net/ConnectException.xml
+++ b/docs/Mono.Android/en/Java.Net/ConnectException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Construct a new ConnectException with no detailed message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Constructs a new ConnectException with the specified detail
+            message as to why the connect error occurred.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/ConnectException#ConnectException()" title="Reference documentation">Java documentation for <code>java.net.ConnectException.ConnectException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/ConnectException#ConnectException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.ConnectException.ConnectException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/ContentHandler.xml b/docs/Mono.Android/en/Java.Net/ContentHandler.xml
index 5df98b4e47..4965ad1857 100644
--- a/docs/Mono.Android/en/Java.Net/ContentHandler.xml
+++ b/docs/Mono.Android/en/Java.Net/ContentHandler.xml
@@ -153,16 +153,18 @@
         <Parameter Name="classes" Type="Java.Lang.Class[]" />
       </Parameters>
       <Docs>
-        <param name="classes">To be added.</param>
         <param name="urlc">a URL connection.</param>
+        <param name="classes">an array of types requested</param>
         <summary>Given a URL connect stream positioned at the beginning of the
             representation of an object, this method reads that stream and
-            creates an object from it.</summary>
-        <returns>the object read by the <c>ContentHandler</c>.</returns>
+            creates an object that matches one of the types specified.</summary>
+        <returns>the object read by the <c>ContentHandler</c> that is
+                            the first match of the suggested types.
+                            null if none of the requested  are supported.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/ContentHandler#getContent(java.net.URLConnection)" title="Reference documentation">Java documentation for <code>java.net.ContentHandler.getContent(java.net.URLConnection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/ContentHandler#getContent(java.net.URLConnection,%20java.lang.Class[])" title="Reference documentation">Java documentation for <code>java.net.ContentHandler.getContent(java.net.URLConnection, java.lang.Class[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/CookieManager.xml b/docs/Mono.Android/en/Java.Net/CookieManager.xml
index 08a20e674d..528075d4fa 100644
--- a/docs/Mono.Android/en/Java.Net/CookieManager.xml
+++ b/docs/Mono.Android/en/Java.Net/CookieManager.xml
@@ -90,13 +90,18 @@
         <Parameter Name="cookiePolicy" Type="Java.Net.ICookiePolicy" />
       </Parameters>
       <Docs>
-        <param name="store">To be added.</param>
-        <param name="cookiePolicy">To be added.</param>
-        <summary>Create a new cookie manager.</summary>
+        <param name="store">a <c>CookieStore</c> to be used by cookie manager.
+                             if <c>null</c>, cookie manager will use a default one,
+                             which is an in-memory CookieStore implementation.</param>
+        <param name="cookiePolicy">a <c>CookiePolicy</c> instance
+                                     to be used by cookie manager as policy callback.
+                                     if <c>null</c>, ACCEPT_ORIGINAL_SERVER will
+                                     be used.</param>
+        <summary>Create a new cookie manager with specified cookie store and cookie policy.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/CookieManager#CookieManager()" title="Reference documentation">Java documentation for <code>java.net.CookieManager.CookieManager()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/CookieManager#CookieManager(java.net.CookieStore,%20java.net.CookiePolicy)" title="Reference documentation">Java documentation for <code>java.net.CookieManager.CookieManager(java.net.CookieStore, java.net.CookiePolicy)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/DatagramPacket.xml b/docs/Mono.Android/en/Java.Net/DatagramPacket.xml
index c18345484c..40a6e59191 100644
--- a/docs/Mono.Android/en/Java.Net/DatagramPacket.xml
+++ b/docs/Mono.Android/en/Java.Net/DatagramPacket.xml
@@ -96,15 +96,16 @@
         <Parameter Name="address" Type="Java.Net.SocketAddress" />
       </Parameters>
       <Docs>
-        <param name="address">To be added.</param>
-        <param name="buf">buffer for holding the incoming datagram.</param>
-        <param name="length">the number of bytes to read.</param>
-        <summary>Constructs a <c>DatagramPacket</c> for receiving packets of
-            length <c>length</c>.</summary>
+        <param name="buf">the packet data.</param>
+        <param name="length">the packet length.</param>
+        <param name="address">the destination address.</param>
+        <summary>Constructs a datagram packet for sending packets of length
+            <c>length</c> to the specified port number on the specified
+            host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int,%20java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int, java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -140,15 +141,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
         <param name="buf">buffer for holding the incoming datagram.</param>
+        <param name="offset">the offset for the buffer</param>
         <param name="length">the number of bytes to read.</param>
         <summary>Constructs a <c>DatagramPacket</c> for receiving packets of
-            length <c>length</c>.</summary>
+            length <c>length</c>, specifying an offset into the buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -183,16 +184,17 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="buf">buffer for holding the incoming datagram.</param>
-        <param name="length">the number of bytes to read.</param>
-        <summary>Constructs a <c>DatagramPacket</c> for receiving packets of
-            length <c>length</c>.</summary>
+        <param name="buf">the packet data.</param>
+        <param name="length">the packet length.</param>
+        <param name="address">the destination address.</param>
+        <param name="port">the destination port number.</param>
+        <summary>Constructs a datagram packet for sending packets of length
+            <c>length</c> to the specified port number on the specified
+            host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -227,16 +229,17 @@
         <Parameter Name="address" Type="Java.Net.SocketAddress" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="address">To be added.</param>
-        <param name="buf">buffer for holding the incoming datagram.</param>
-        <param name="length">the number of bytes to read.</param>
-        <summary>Constructs a <c>DatagramPacket</c> for receiving packets of
-            length <c>length</c>.</summary>
+        <param name="buf">the packet data.</param>
+        <param name="offset">the packet data offset.</param>
+        <param name="length">the packet data length.</param>
+        <param name="address">the destination socket address.</param>
+        <summary>Constructs a datagram packet for sending packets of length
+            <c>length</c> with offset <c>ioffset</c>to the
+            specified port number on the specified host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int,%20int,%20java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int, int, java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -274,17 +277,18 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="address">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="buf">buffer for holding the incoming datagram.</param>
-        <param name="length">the number of bytes to read.</param>
-        <summary>Constructs a <c>DatagramPacket</c> for receiving packets of
-            length <c>length</c>.</summary>
+        <param name="buf">the packet data.</param>
+        <param name="offset">the packet data offset.</param>
+        <param name="length">the packet data length.</param>
+        <param name="address">the destination address.</param>
+        <param name="port">the destination port number.</param>
+        <summary>Constructs a datagram packet for sending packets of length
+            <c>length</c> with offset <c>ioffset</c>to the
+            specified port number on the specified host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramPacket#DatagramPacket(byte[],%20int,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.DatagramPacket(byte[], int, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -624,14 +628,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="buf">the buffer to set for this packet.</param>
+        <param name="buf">the buffer to set for this packet</param>
+        <param name="offset">the offset into the data</param>
+        <param name="length">the length of the data
+                  and/or the length of the buffer used to receive data</param>
         <summary>Set the data buffer for this packet.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramPacket#setData(byte[])" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.setData(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramPacket#setData(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramPacket.setData(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/DatagramSocket.xml b/docs/Mono.Android/en/Java.Net/DatagramSocket.xml
index ebd8d7e238..eecaed04bc 100644
--- a/docs/Mono.Android/en/Java.Net/DatagramSocket.xml
+++ b/docs/Mono.Android/en/Java.Net/DatagramSocket.xml
@@ -103,13 +103,14 @@
         <Parameter Name="impl" Type="Java.Net.DatagramSocketImpl" />
       </Parameters>
       <Docs>
-        <param name="impl">To be added.</param>
-        <summary>Constructs a datagram socket and binds it to any available port
-            on the local host machine.</summary>
+        <param name="impl">an instance of a &lt;B&gt;DatagramSocketImpl&lt;/B&gt;
+                   the subclass wishes to use on the DatagramSocket.</param>
+        <summary>Creates an unbound datagram socket with the specified
+            DatagramSocketImpl.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket()" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket(java.net.DatagramSocketImpl)" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket(java.net.DatagramSocketImpl)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,13 +142,14 @@
         <Parameter Name="bindaddr" Type="Java.Net.SocketAddress" />
       </Parameters>
       <Docs>
-        <param name="bindaddr">To be added.</param>
-        <summary>Constructs a datagram socket and binds it to any available port
-            on the local host machine.</summary>
+        <param name="bindaddr">local socket address to bind, or <c>null</c>
+                            for an unbound socket.</param>
+        <summary>Creates a datagram socket, bound to the specified local
+            socket address.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket()" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket(java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -182,13 +184,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <summary>Constructs a datagram socket and binds it to any available port
+        <param name="port">port to use.</param>
+        <summary>Constructs a datagram socket and binds it to the specified port
             on the local host machine.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket()" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket(int)" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -223,14 +225,14 @@
         <Parameter Name="laddr" Type="Java.Net.InetAddress" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <param name="laddr">To be added.</param>
-        <summary>Constructs a datagram socket and binds it to any available port
-            on the local host machine.</summary>
+        <param name="port">local port to use</param>
+        <param name="laddr">local address to bind</param>
+        <summary>Creates a datagram socket, bound to the specified local
+            address.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket()" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramSocket#DatagramSocket(int,%20java.net.InetAddress)" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.DatagramSocket(int, java.net.InetAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -466,14 +468,12 @@
         <Parameter Name="addr" Type="Java.Net.SocketAddress" />
       </Parameters>
       <Docs>
-        <param name="addr">To be added.</param>
-        <param name="address">the remote address for the socket</param>
-        <param name="port">the remote port for the socket.</param>
-        <summary>Connects the socket to a remote address for this socket.</summary>
+        <param name="addr">The remote address.</param>
+        <summary>Connects this socket to a remote socket address (IP address + port number).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/DatagramSocket#connect(java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.connect(java.net.InetAddress, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/DatagramSocket#connect(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.net.DatagramSocket.connect(java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/HttpRetryException.xml b/docs/Mono.Android/en/Java.Net/HttpRetryException.xml
index 9e0fde52af..d3aa78381f 100644
--- a/docs/Mono.Android/en/Java.Net/HttpRetryException.xml
+++ b/docs/Mono.Android/en/Java.Net/HttpRetryException.xml
@@ -135,15 +135,15 @@
         <Parameter Name="location" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="location">To be added.</param>
         <param name="detail">the detail message.</param>
         <param name="code">the HTTP response code from server.</param>
-        <summary>Constructs a new <c>HttpRetryException</c> from the
-            specified response code and exception detail message</summary>
+        <param name="location">the URL to be redirected to</param>
+        <summary>Constructs a new <c>HttpRetryException</c> with detail message
+            responseCode and the contents of the Location response header field.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/HttpRetryException#HttpRetryException(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.HttpRetryException.HttpRetryException(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/HttpRetryException#HttpRetryException(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.HttpRetryException.HttpRetryException(java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/HttpURLConnection.xml b/docs/Mono.Android/en/Java.Net/HttpURLConnection.xml
index f80768bcd5..fa7d521d60 100644
--- a/docs/Mono.Android/en/Java.Net/HttpURLConnection.xml
+++ b/docs/Mono.Android/en/Java.Net/HttpURLConnection.xml
@@ -2208,15 +2208,14 @@
         <Parameter Name="contentLength" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="contentLength">The number of bytes which will be written
-                     to the OutputStream.</param>
+        <param name="contentLength">The number of bytes which will be written to the OutputStream.</param>
         <summary>This method is used to enable streaming of a HTTP request body
             without internal buffering, when the content length is known in
             advance.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/HttpURLConnection#setFixedLengthStreamingMode(int)" title="Reference documentation">Java documentation for <code>java.net.HttpURLConnection.setFixedLengthStreamingMode(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/HttpURLConnection#setFixedLengthStreamingMode(long)" title="Reference documentation">Java documentation for <code>java.net.HttpURLConnection.setFixedLengthStreamingMode(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/IDN.xml b/docs/Mono.Android/en/Java.Net/IDN.xml
index 451248703f..e930f96a29 100644
--- a/docs/Mono.Android/en/Java.Net/IDN.xml
+++ b/docs/Mono.Android/en/Java.Net/IDN.xml
@@ -243,15 +243,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flag">To be added.</param>
         <param name="input">the string to be processed</param>
+        <param name="flag">process flag; can be 0 or any logical OR of possible flags</param>
         <summary>Translates a string from Unicode to ASCII Compatible Encoding (ACE),
             as defined by the ToASCII operation of &lt;a href="http://www.</summary>
         <returns>the translated <c>String</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/IDN#toASCII(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.IDN.toASCII(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/IDN#toASCII(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.IDN.toASCII(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -337,15 +337,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flag">To be added.</param>
         <param name="input">the string to be processed</param>
+        <param name="flag">process flag; can be 0 or any logical OR of possible flags</param>
         <summary>Translates a string from ASCII Compatible Encoding (ACE) to Unicode,
             as defined by the ToUnicode operation of &lt;a href="http://www.</summary>
         <returns>the translated <c>String</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/IDN#toUnicode(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.IDN.toUnicode(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/IDN#toUnicode(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.IDN.toUnicode(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/Inet6Address.xml b/docs/Mono.Android/en/Java.Net/Inet6Address.xml
index 73c371edd4..7939cd0da7 100644
--- a/docs/Mono.Android/en/Java.Net/Inet6Address.xml
+++ b/docs/Mono.Android/en/Java.Net/Inet6Address.xml
@@ -59,17 +59,17 @@
         <Parameter Name="nif" Type="Java.Net.NetworkInterface" />
       </Parameters>
       <Docs>
-        <param name="nif">the network interface that this address is associated with.</param>
         <param name="host">the specified host</param>
         <param name="addr">the raw IP address in network byte order</param>
-        <param name="scope_id">the numeric scope_id for the address.</param>
+        <param name="nif">an interface this address must be associated with.</param>
         <summary>Create an Inet6Address in the exact manner of <c>InetAddress#getByAddress(String,byte[])</c> except that the IPv6 scope_id is
-            set to the given numeric value.</summary>
+            set to the value corresponding to the given interface for the address
+            type specified in <c>addr</c>.</summary>
         <returns>an Inet6Address object created from the raw IP address.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Inet6Address#getByAddress(java.lang.String,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>java.net.Inet6Address.getByAddress(java.lang.String, byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Inet6Address#getByAddress(java.lang.String,%20byte[],%20java.net.NetworkInterface)" title="Reference documentation">Java documentation for <code>java.net.Inet6Address.getByAddress(java.lang.String, byte[], java.net.NetworkInterface)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/InetAddress.xml b/docs/Mono.Android/en/Java.Net/InetAddress.xml
index 0fe3e98873..9798beb4e0 100644
--- a/docs/Mono.Android/en/Java.Net/InetAddress.xml
+++ b/docs/Mono.Android/en/Java.Net/InetAddress.xml
@@ -215,14 +215,13 @@
         <Parameter Name="addr" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="host">the specified host</param>
         <param name="addr">the raw IP address in network byte order</param>
-        <summary>Creates an InetAddress based on the provided host name and IP address.</summary>
+        <summary>Returns an <c>InetAddress</c> object given the raw IP address .</summary>
         <returns>an InetAddress object created from the raw IP address.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/InetAddress#getByAddress(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>java.net.InetAddress.getByAddress(java.lang.String, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/InetAddress#getByAddress(byte[])" title="Reference documentation">Java documentation for <code>java.net.InetAddress.getByAddress(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -817,15 +816,17 @@
         <Parameter Name="timeout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="netif">To be added.</param>
-        <param name="ttl">the maximum count of hops (time-to-live).</param>
+        <param name="netif">the NetworkInterface through which the
+                               test will be done, or null for any interface</param>
+        <param name="ttl">the maximum numbers of hops to try or 0 for the
+                             default</param>
         <param name="timeout">the time, in milliseconds, before the call aborts</param>
         <summary>Test whether that address is reachable.</summary>
-        <returns>a <c>boolean</c> indicating if the address is reachable.</returns>
+        <returns>a <c>boolean</c>indicating if the address is reachable.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/InetAddress#isReachable(int)" title="Reference documentation">Java documentation for <code>java.net.InetAddress.isReachable(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/InetAddress#isReachable(java.net.NetworkInterface,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.net.InetAddress.isReachable(java.net.NetworkInterface, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/InetSocketAddress.xml b/docs/Mono.Android/en/Java.Net/InetSocketAddress.xml
index 3007fcd7c8..5e9b20dbc6 100644
--- a/docs/Mono.Android/en/Java.Net/InetSocketAddress.xml
+++ b/docs/Mono.Android/en/Java.Net/InetSocketAddress.xml
@@ -56,13 +56,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <summary>Creates a socket endpoint with the given port number <c>port</c> and
- no specified address.</summary>
+        <param name="port">The port number</param>
+        <summary>Creates a socket address where the IP address is the wildcard address
+            and the port number a specified value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/InetSocketAddress#InetSocketAddress()" title="Reference documentation">Java documentation for <code>java.net.InetSocketAddress.InetSocketAddress()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/InetSocketAddress#InetSocketAddress(int)" title="Reference documentation">Java documentation for <code>java.net.InetSocketAddress.InetSocketAddress(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -95,14 +95,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="addr">To be added.</param>
-        <param name="port">To be added.</param>
-        <summary>Creates a socket endpoint with the given port number <c>port</c> and
- <c>address</c>.</summary>
+        <param name="addr">The IP address</param>
+        <param name="port">The port number</param>
+        <summary>Creates a socket address from an IP address and a port number.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/InetSocketAddress#InetSocketAddress()" title="Reference documentation">Java documentation for <code>java.net.InetSocketAddress.InetSocketAddress()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/InetSocketAddress#InetSocketAddress(java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.InetSocketAddress.InetSocketAddress(java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -158,14 +157,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="hostname">To be added.</param>
-        <param name="port">To be added.</param>
-        <summary>Creates a socket endpoint with the given port number <c>port</c> and the
- hostname <c>host</c>.</summary>
+        <param name="hostname">the Host name</param>
+        <param name="port">The port number</param>
+        <summary>Creates a socket address from a hostname and a port number.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/InetSocketAddress#InetSocketAddress()" title="Reference documentation">Java documentation for <code>java.net.InetSocketAddress.InetSocketAddress()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/InetSocketAddress#InetSocketAddress(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.InetSocketAddress.InetSocketAddress(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/MalformedURLException.xml b/docs/Mono.Android/en/Java.Net/MalformedURLException.xml
index 24b78ce728..495b5a36c5 100644
--- a/docs/Mono.Android/en/Java.Net/MalformedURLException.xml
+++ b/docs/Mono.Android/en/Java.Net/MalformedURLException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a <c>MalformedURLException</c> with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a <c>MalformedURLException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/MalformedURLException#MalformedURLException()" title="Reference documentation">Java documentation for <code>java.net.MalformedURLException.MalformedURLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/MalformedURLException#MalformedURLException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.MalformedURLException.MalformedURLException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/MulticastSocket.xml b/docs/Mono.Android/en/Java.Net/MulticastSocket.xml
index c0728d53f9..083aa98fd9 100644
--- a/docs/Mono.Android/en/Java.Net/MulticastSocket.xml
+++ b/docs/Mono.Android/en/Java.Net/MulticastSocket.xml
@@ -90,12 +90,13 @@
         <Parameter Name="bindaddr" Type="Java.Net.SocketAddress" />
       </Parameters>
       <Docs>
-        <param name="bindaddr">To be added.</param>
-        <summary>Create a multicast socket.</summary>
+        <param name="bindaddr">Socket address to bind to, or <c>null</c> for
+                            an unbound socket.</param>
+        <summary>Create a MulticastSocket bound to the specified socket address.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/MulticastSocket#MulticastSocket()" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.MulticastSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/MulticastSocket#MulticastSocket(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.MulticastSocket(java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -131,12 +132,12 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <summary>Create a multicast socket.</summary>
+        <param name="port">port to use</param>
+        <summary>Create a multicast socket and bind it to a specific port.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/MulticastSocket#MulticastSocket()" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.MulticastSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/MulticastSocket#MulticastSocket(int)" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.MulticastSocket(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -328,13 +329,16 @@
         <Parameter Name="netIf" Type="Java.Net.NetworkInterface" />
       </Parameters>
       <Docs>
-        <param name="netIf">To be added.</param>
         <param name="mcastaddr">is the multicast address to join</param>
-        <summary>Joins a multicast group.</summary>
+        <param name="netIf">specifies the local interface to receive multicast
+                   datagram packets, or <i>null</i> to defer to the interface set by
+                  <c>MulticastSocket#setInterface(InetAddress)</c> or
+                  <c>MulticastSocket#setNetworkInterface(NetworkInterface)</c></param>
+        <summary>Joins the specified multicast group at the specified interface.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/MulticastSocket#joinGroup(java.net.InetAddress)" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.joinGroup(java.net.InetAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/MulticastSocket#joinGroup(java.net.SocketAddress,%20java.net.NetworkInterface)" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.joinGroup(java.net.SocketAddress, java.net.NetworkInterface)</code>.</a>
             </format>
           </para>
           <para>
@@ -416,13 +420,16 @@
         <Parameter Name="netIf" Type="Java.Net.NetworkInterface" />
       </Parameters>
       <Docs>
-        <param name="netIf">To be added.</param>
         <param name="mcastaddr">is the multicast address to leave</param>
-        <summary>Leave a multicast group.</summary>
+        <param name="netIf">specifies the local interface or <i>null</i> to defer
+                        to the interface set by
+                        <c>MulticastSocket#setInterface(InetAddress)</c> or
+                        <c>MulticastSocket#setNetworkInterface(NetworkInterface)</c></param>
+        <summary>Leave a multicast group on a specified local interface.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/MulticastSocket#leaveGroup(java.net.InetAddress)" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.leaveGroup(java.net.InetAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/MulticastSocket#leaveGroup(java.net.SocketAddress,%20java.net.NetworkInterface)" title="Reference documentation">Java documentation for <code>java.net.MulticastSocket.leaveGroup(java.net.SocketAddress, java.net.NetworkInterface)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/NoRouteToHostException.xml b/docs/Mono.Android/en/Java.Net/NoRouteToHostException.xml
index 78d1bc5f12..c078f4c6dd 100644
--- a/docs/Mono.Android/en/Java.Net/NoRouteToHostException.xml
+++ b/docs/Mono.Android/en/Java.Net/NoRouteToHostException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Construct a new NoRouteToHostException with no detailed message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Constructs a new NoRouteToHostException with the specified detail
+            message as to why the remote host cannot be reached.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/NoRouteToHostException#NoRouteToHostException()" title="Reference documentation">Java documentation for <code>java.net.NoRouteToHostException.NoRouteToHostException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/NoRouteToHostException#NoRouteToHostException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.NoRouteToHostException.NoRouteToHostException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/PortUnreachableException.xml b/docs/Mono.Android/en/Java.Net/PortUnreachableException.xml
index d1cd777bde..638ae27ffa 100644
--- a/docs/Mono.Android/en/Java.Net/PortUnreachableException.xml
+++ b/docs/Mono.Android/en/Java.Net/PortUnreachableException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Construct a new <c>PortUnreachableException</c> with no
-            detailed message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Constructs a new <c>PortUnreachableException</c> with a
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/PortUnreachableException#PortUnreachableException()" title="Reference documentation">Java documentation for <code>java.net.PortUnreachableException.PortUnreachableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/PortUnreachableException#PortUnreachableException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.PortUnreachableException.PortUnreachableException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/ProtocolException.xml b/docs/Mono.Android/en/Java.Net/ProtocolException.xml
index 6a20e8beaa..b456f0bd00 100644
--- a/docs/Mono.Android/en/Java.Net/ProtocolException.xml
+++ b/docs/Mono.Android/en/Java.Net/ProtocolException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="host" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <summary>Constructs a new <c>ProtocolException</c> with no detail message.</summary>
+        <param name="host">the detail message.</param>
+        <summary>Constructs a new <c>ProtocolException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/ProtocolException#ProtocolException()" title="Reference documentation">Java documentation for <code>java.net.ProtocolException.ProtocolException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/ProtocolException#ProtocolException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.ProtocolException.ProtocolException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/ServerSocket.xml b/docs/Mono.Android/en/Java.Net/ServerSocket.xml
index a51b9550ee..508fc57484 100644
--- a/docs/Mono.Android/en/Java.Net/ServerSocket.xml
+++ b/docs/Mono.Android/en/Java.Net/ServerSocket.xml
@@ -102,12 +102,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <summary>Creates an unbound server socket.</summary>
+        <param name="port">the port number, or <c>0</c> to use a port
+                              number that is automatically allocated.</param>
+        <summary>Creates a server socket, bound to the specified port.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/ServerSocket#ServerSocket()" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.ServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/ServerSocket#ServerSocket(int)" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.ServerSocket(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -142,13 +143,16 @@
         <Parameter Name="backlog" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <param name="backlog">To be added.</param>
-        <summary>Creates an unbound server socket.</summary>
+        <param name="port">the port number, or <c>0</c> to use a port
+                                 number that is automatically allocated.</param>
+        <param name="backlog">requested maximum length of the queue of incoming
+                                 connections.</param>
+        <summary>Creates a server socket and binds it to the specified local port
+            number, with the specified backlog.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/ServerSocket#ServerSocket()" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.ServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/ServerSocket#ServerSocket(int,%20int)" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.ServerSocket(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -207,14 +211,17 @@
         <Parameter Name="bindAddr" Type="Java.Net.InetAddress" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <param name="backlog">To be added.</param>
-        <param name="bindAddr">To be added.</param>
-        <summary>Creates an unbound server socket.</summary>
+        <param name="port">the port number, or <c>0</c> to use a port
+                         number that is automatically allocated.</param>
+        <param name="backlog">requested maximum length of the queue of incoming
+                           connections.</param>
+        <param name="bindAddr">the local InetAddress the server will bind to</param>
+        <summary>Create a server with the specified port, listen backlog, and
+            local IP address to bind to.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/ServerSocket#ServerSocket()" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.ServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/ServerSocket#ServerSocket(int,%20int,%20java.net.InetAddress)" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.ServerSocket(int, int, java.net.InetAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -360,15 +367,15 @@
         <Parameter Name="backlog" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="backlog">the maximum number of unaccepted connections. Passing 0 or
-     a negative value yields the default backlog of 50.</param>
         <param name="endpoint">The IP address and port number to bind to.</param>
+        <param name="backlog">requested maximum length of the queue of
+                                     incoming connections.</param>
         <summary>Binds the <c>ServerSocket</c> to a specific address
             (IP address and port number).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/ServerSocket#bind(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.bind(java.net.SocketAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/ServerSocket#bind(java.net.SocketAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.ServerSocket.bind(java.net.SocketAddress, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/Socket.xml b/docs/Mono.Android/en/Java.Net/Socket.xml
index 4557843012..35c7e81f80 100644
--- a/docs/Mono.Android/en/Java.Net/Socket.xml
+++ b/docs/Mono.Android/en/Java.Net/Socket.xml
@@ -104,13 +104,14 @@
         <Parameter Name="proxy" Type="Java.Net.Proxy" />
       </Parameters>
       <Docs>
-        <param name="proxy">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="proxy">a <c>java.net.Proxy Proxy</c> object specifying what kind
+                         of proxying should be used.</param>
+        <summary>Creates an unconnected socket, specifying the type of proxy, if any,
+            that should be used regardless of any other settings.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.net.Proxy)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.net.Proxy)</code>.</a>
             </format>
           </para>
           <para>
@@ -146,13 +147,14 @@
         <Parameter Name="impl" Type="Java.Net.SocketImpl" />
       </Parameters>
       <Docs>
-        <param name="impl">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="impl">an instance of a &lt;B&gt;SocketImpl&lt;/B&gt;
+            the subclass wishes to use on the Socket.</param>
+        <summary>Creates an unconnected Socket with a user-specified
+            SocketImpl.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.net.SocketImpl)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.net.SocketImpl)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,14 +189,14 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">To be added.</param>
-        <param name="port">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="address">the IP address.</param>
+        <param name="port">the port number.</param>
+        <summary>Creates a stream socket and connects it to the specified port
+            number at the specified IP address.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -252,14 +254,14 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="host">the host name, or <c>null</c> for the loopback address.</param>
+        <param name="port">the port number.</param>
+        <summary>Creates a stream socket and connects it to the specified port
+            number on the named host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -300,15 +302,16 @@
         <Parameter Name="stream" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="stream">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="host">the IP address.</param>
+        <param name="port">the port number.</param>
+        <param name="stream">if <c>true</c>, create a stream socket;
+                                  otherwise, create a datagram socket.</param>
+        <summary>Creates a socket and connects it to the specified port number at
+            the specified IP address.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.net.InetAddress,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.net.InetAddress, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -347,15 +350,16 @@
         <Parameter Name="stream" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="stream">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="host">the host name, or <c>null</c> for the loopback address.</param>
+        <param name="port">the port number.</param>
+        <param name="stream">a <c>boolean</c> indicating whether this is
+                                 a stream socket or a datagram socket.</param>
+        <summary>Creates a stream socket and connects it to the specified port
+            number on the named host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.lang.String,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.lang.String, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -392,16 +396,18 @@
         <Parameter Name="localPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="localAddr">To be added.</param>
-        <param name="localPort">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="address">the remote address</param>
+        <param name="port">the remote port</param>
+        <param name="localAddr">the local address the socket is bound to, or
+                   <c>null</c> for the <c>anyLocal</c> address.</param>
+        <param name="localPort">the local port the socket is bound to or
+                   <c>zero</c> for a system selected free port.</param>
+        <summary>Creates a socket and connects it to the specified remote address on
+            the specified remote port.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.net.InetAddress,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.net.InetAddress, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -438,16 +444,18 @@
         <Parameter Name="localPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="localAddr">To be added.</param>
-        <param name="localPort">To be added.</param>
-        <summary>Creates an unconnected socket, with the
-            system-default type of SocketImpl.</summary>
+        <param name="host">the name of the remote host, or <c>null</c> for the loopback address.</param>
+        <param name="port">the remote port</param>
+        <param name="localAddr">the local address the socket is bound to, or
+                   <c>null</c> for the <c>anyLocal</c> address.</param>
+        <param name="localPort">the local port the socket is bound to, or
+                   <c>zero</c> for a system selected free port.</param>
+        <summary>Creates a socket and connects it to the specified remote host on
+            the specified remote port.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#Socket()" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#Socket(java.lang.String,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.Socket.Socket(java.lang.String, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -656,14 +664,13 @@
         <Parameter Name="timeout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="timeout">the timeout value in milliseconds or <c>0</c> for an infinite
-            timeout.</param>
         <param name="endpoint">the <c>SocketAddress</c></param>
-        <summary>Connects this socket to the server.</summary>
+        <param name="timeout">the timeout value to be used in milliseconds.</param>
+        <summary>Connects this socket to the server with a specified timeout value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/Socket#connect(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.net.Socket.connect(java.net.SocketAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/Socket#connect(java.net.SocketAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.Socket.connect(java.net.SocketAddress, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/SocketException.xml b/docs/Mono.Android/en/Java.Net/SocketException.xml
index 18bffb8d71..1a454c2ed0 100644
--- a/docs/Mono.Android/en/Java.Net/SocketException.xml
+++ b/docs/Mono.Android/en/Java.Net/SocketException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a new <c>SocketException</c> with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a new <c>SocketException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/SocketException#SocketException()" title="Reference documentation">Java documentation for <code>java.net.SocketException.SocketException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/SocketException#SocketException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.SocketException.SocketException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/SocketImpl.xml b/docs/Mono.Android/en/Java.Net/SocketImpl.xml
index 2d681184df..5176e8f6b6 100644
--- a/docs/Mono.Android/en/Java.Net/SocketImpl.xml
+++ b/docs/Mono.Android/en/Java.Net/SocketImpl.xml
@@ -349,14 +349,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">the remote host address this socket has to be connected to.</param>
-        <param name="host">the name of the remote host.</param>
+        <param name="address">the IP address of the remote host.</param>
         <param name="port">the port number.</param>
-        <summary>Connects this socket to the specified port on the named host.</summary>
+        <summary>Connects this socket to the specified port number on the specified host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/SocketImpl#connect(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.SocketImpl.connect(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/SocketImpl#connect(java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.SocketImpl.connect(java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -394,15 +393,13 @@
         <Parameter Name="timeout" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">To be added.</param>
-        <param name="timeout">the timeout value in milliseconds.</param>
-        <param name="host">the name of the remote host.</param>
-        <param name="port">the port number.</param>
-        <summary>Connects this socket to the specified port on the named host.</summary>
+        <param name="address">the Socket address of the remote host.</param>
+        <param name="timeout">the timeout value, in milliseconds, or zero for no timeout.</param>
+        <summary>Connects this socket to the specified port number on the specified host.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/SocketImpl#connect(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.SocketImpl.connect(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/SocketImpl#connect(java.net.SocketAddress,%20int)" title="Reference documentation">Java documentation for <code>java.net.SocketImpl.connect(java.net.SocketAddress, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/SocketTimeoutException.xml b/docs/Mono.Android/en/Java.Net/SocketTimeoutException.xml
index a51c54d81e..b414b3f565 100644
--- a/docs/Mono.Android/en/Java.Net/SocketTimeoutException.xml
+++ b/docs/Mono.Android/en/Java.Net/SocketTimeoutException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Construct a new SocketTimeoutException with no detailed message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Constructs a new SocketTimeoutException with a detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/SocketTimeoutException#SocketTimeoutException()" title="Reference documentation">Java documentation for <code>java.net.SocketTimeoutException.SocketTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/SocketTimeoutException#SocketTimeoutException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.SocketTimeoutException.SocketTimeoutException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URI.xml b/docs/Mono.Android/en/Java.Net/URI.xml
index 659a834356..9e85734f54 100644
--- a/docs/Mono.Android/en/Java.Net/URI.xml
+++ b/docs/Mono.Android/en/Java.Net/URI.xml
@@ -110,15 +110,14 @@
         <Parameter Name="fragment" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="scheme">To be added.</param>
-        <param name="ssp">To be added.</param>
-        <param name="fragment">To be added.</param>
-        <param name="str">The string to be parsed into a URI</param>
-        <summary>Constructs a URI by parsing the given string.</summary>
+        <param name="scheme">Scheme name</param>
+        <param name="ssp">Scheme-specific part</param>
+        <param name="fragment">Fragment</param>
+        <summary>Constructs a URI from the given components.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -154,16 +153,15 @@
         <Parameter Name="fragment" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="scheme">To be added.</param>
-        <param name="host">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="fragment">To be added.</param>
-        <param name="str">The string to be parsed into a URI</param>
-        <summary>Constructs a URI by parsing the given string.</summary>
+        <param name="scheme">Scheme name</param>
+        <param name="host">Host name</param>
+        <param name="path">Path</param>
+        <param name="fragment">Fragment</param>
+        <summary>Constructs a hierarchical URI from the given components.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -200,17 +198,16 @@
         <Parameter Name="fragment" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="scheme">To be added.</param>
-        <param name="authority">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="query">To be added.</param>
-        <param name="fragment">To be added.</param>
-        <param name="str">The string to be parsed into a URI</param>
-        <summary>Constructs a URI by parsing the given string.</summary>
+        <param name="scheme">Scheme name</param>
+        <param name="authority">Authority</param>
+        <param name="path">Path</param>
+        <param name="query">Query</param>
+        <param name="fragment">Fragment</param>
+        <summary>Constructs a hierarchical URI from the given components.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -249,19 +246,18 @@
         <Parameter Name="fragment" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="scheme">To be added.</param>
-        <param name="userInfo">To be added.</param>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="query">To be added.</param>
-        <param name="fragment">To be added.</param>
-        <param name="str">The string to be parsed into a URI</param>
-        <summary>Constructs a URI by parsing the given string.</summary>
+        <param name="scheme">Scheme name</param>
+        <param name="userInfo">User name and authorization information</param>
+        <param name="host">Host name</param>
+        <param name="port">Port number</param>
+        <param name="path">Path</param>
+        <param name="query">Query</param>
+        <param name="fragment">Fragment</param>
+        <summary>Constructs a hierarchical URI from the given components.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URI#URI(java.lang.String,%20java.lang.String,%20java.lang.String,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.URI(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1097,15 +1093,13 @@
         <Parameter Name="uri" Type="Java.Net.URI" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="str">The string to be parsed into a URI</param>
-        <summary>Constructs a new URI by parsing the given string and then resolving it
-            against this URI.</summary>
+        <param name="uri">The URI to be resolved against this URI</param>
+        <summary>Resolves the given URI against this URI.</summary>
         <returns>The resulting URI</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URI#resolve(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URI.resolve(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URI#resolve(java.net.URI)" title="Reference documentation">Java documentation for <code>java.net.URI.resolve(java.net.URI)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URISyntaxException.xml b/docs/Mono.Android/en/Java.Net/URISyntaxException.xml
index 76019c5483..0cb1694de2 100644
--- a/docs/Mono.Android/en/Java.Net/URISyntaxException.xml
+++ b/docs/Mono.Android/en/Java.Net/URISyntaxException.xml
@@ -122,14 +122,16 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
         <param name="input">The input string</param>
         <param name="reason">A string explaining why the input could not be parsed</param>
-        <summary>Constructs an instance from the given input string and reason.</summary>
+        <param name="index">The index at which the parse error occurred,
+                            or <c>-1</c> if the index is not known</param>
+        <summary>Constructs an instance from the given input string, reason, and error
+            index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URISyntaxException#URISyntaxException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URISyntaxException.URISyntaxException(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URISyntaxException#URISyntaxException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.net.URISyntaxException.URISyntaxException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URL.xml b/docs/Mono.Android/en/Java.Net/URL.xml
index 9be548e123..ff7b9dcd61 100644
--- a/docs/Mono.Android/en/Java.Net/URL.xml
+++ b/docs/Mono.Android/en/Java.Net/URL.xml
@@ -111,14 +111,13 @@
         <Parameter Name="spec" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
+        <param name="context">the context in which to parse the specification.</param>
         <param name="spec">the <c>String</c> to parse as a URL.</param>
-        <summary>Creates a <c>URL</c> object from the <c>String</c>
-            representation.</summary>
+        <summary>Creates a URL by parsing the given spec within a specified context.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URL#URL(java.net.URL,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.net.URL, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,15 +154,15 @@
         <Parameter Name="handler" Type="Java.Net.URLStreamHandler" />
       </Parameters>
       <Docs>
-        <param name="context">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="context">the context in which to parse the specification.</param>
         <param name="spec">the <c>String</c> to parse as a URL.</param>
-        <summary>Creates a <c>URL</c> object from the <c>String</c>
-            representation.</summary>
+        <param name="handler">the stream handler for the URL.</param>
+        <summary>Creates a URL by parsing the given spec with the specified handler
+            within a specified context.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URL#URL(java.net.URL,%20java.lang.String,%20java.net.URLStreamHandler)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.net.URL, java.lang.String, java.net.URLStreamHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -200,16 +199,15 @@
         <Parameter Name="file" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="protocol">To be added.</param>
-        <param name="host">To be added.</param>
-        <param name="file">To be added.</param>
-        <param name="spec">the <c>String</c> to parse as a URL.</param>
-        <summary>Creates a <c>URL</c> object from the <c>String</c>
-            representation.</summary>
+        <param name="protocol">the name of the protocol to use.</param>
+        <param name="host">the name of the host.</param>
+        <param name="file">the file on the host.</param>
+        <summary>Creates a URL from the specified <c>protocol</c>
+            name, <c>host</c> name, and <c>file</c> name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -247,17 +245,17 @@
         <Parameter Name="file" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="protocol">To be added.</param>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="file">To be added.</param>
-        <param name="spec">the <c>String</c> to parse as a URL.</param>
-        <summary>Creates a <c>URL</c> object from the <c>String</c>
-            representation.</summary>
+        <param name="protocol">the name of the protocol to use.</param>
+        <param name="host">the name of the host.</param>
+        <param name="port">the port number on the host.</param>
+        <param name="file">the file on the host</param>
+        <summary>Creates a <c>URL</c> object from the specified
+            <c>protocol</c>, <c>host</c>, <c>port</c>
+            number, and <c>file</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String,%20java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String, java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -296,18 +294,18 @@
         <Parameter Name="handler" Type="Java.Net.URLStreamHandler" />
       </Parameters>
       <Docs>
-        <param name="protocol">To be added.</param>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="file">To be added.</param>
-        <param name="handler">To be added.</param>
-        <param name="spec">the <c>String</c> to parse as a URL.</param>
-        <summary>Creates a <c>URL</c> object from the <c>String</c>
-            representation.</summary>
+        <param name="protocol">the name of the protocol to use.</param>
+        <param name="host">the name of the host.</param>
+        <param name="port">the port number on the host.</param>
+        <param name="file">the file on the host</param>
+        <param name="handler">the stream handler for the URL.</param>
+        <summary>Creates a <c>URL</c> object from the specified
+            <c>protocol</c>, <c>host</c>, <c>port</c>
+            number, <c>file</c>, and <c>handler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URL#URL(java.lang.String,%20java.lang.String,%20int,%20java.lang.String,%20java.net.URLStreamHandler)" title="Reference documentation">Java documentation for <code>java.net.URL.URL(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -497,13 +495,15 @@
         <Parameter Name="classes" Type="Java.Lang.Class[]" />
       </Parameters>
       <Docs>
-        <param name="classes">To be added.</param>
+        <param name="classes">an array of Java types</param>
         <summary>Gets the contents of this URL.</summary>
-        <returns>the contents of this URL.</returns>
+        <returns>the content object of this URL that is the first match of
+                          the types specified in the classes array.
+                          null if none of the requested types are supported.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URL#getContent()" title="Reference documentation">Java documentation for <code>java.net.URL.getContent()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URL#getContent(java.lang.Class[])" title="Reference documentation">Java documentation for <code>java.net.URL.getContent(java.lang.Class[])</code>.</a>
             </format>
           </para>
           <para>
@@ -653,16 +653,18 @@
         <Parameter Name="proxy" Type="Java.Net.Proxy" />
       </Parameters>
       <Docs>
-        <param name="proxy">the proxy through which the connection will be established.</param>
-        <summary>Returns a <c>java.net.URLConnection URLConnection</c> instance that
-            represents a connection to the remote object referred to by the
-            <c>URL</c>.</summary>
-        <returns>a <c>java.net.URLConnection URLConnection</c> linking
-                        to the URL.</returns>
+        <param name="proxy">the Proxy through which this connection
+                        will be made. If direct connection is desired,
+                        Proxy.NO_PROXY should be specified.</param>
+        <summary>Same as <c>#openConnection()</c>, except that the connection will be
+            made through the specified proxy; Protocol handlers that do not
+            support proxing will ignore the proxy parameter and make a
+            normal connection.</summary>
+        <returns>a <c>URLConnection</c> to the URL.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URL#openConnection()" title="Reference documentation">Java documentation for <code>java.net.URL.openConnection()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URL#openConnection(java.net.Proxy)" title="Reference documentation">Java documentation for <code>java.net.URL.openConnection(java.net.Proxy)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URLClassLoader.xml b/docs/Mono.Android/en/Java.Net/URLClassLoader.xml
index ae651b6cbe..2467f3d61e 100644
--- a/docs/Mono.Android/en/Java.Net/URLClassLoader.xml
+++ b/docs/Mono.Android/en/Java.Net/URLClassLoader.xml
@@ -107,14 +107,13 @@
         <Parameter Name="parent" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
         <param name="urls">the URLs from which to load classes and resources</param>
-        <summary>Constructs a new URLClassLoader for the specified URLs using the
-            default delegation parent <c>ClassLoader</c>.</summary>
+        <param name="parent">the parent class loader for delegation</param>
+        <summary>Constructs a new URLClassLoader for the given URLs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLClassLoader#URLClassLoader(java.net.URL[])" title="Reference documentation">Java documentation for <code>java.net.URLClassLoader.URLClassLoader(java.net.URL[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLClassLoader#URLClassLoader(java.net.URL[],%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.net.URLClassLoader.URLClassLoader(java.net.URL[], java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -171,15 +170,15 @@
         <Parameter Name="factory" Type="Java.Net.IURLStreamHandlerFactory" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
-        <param name="factory">To be added.</param>
         <param name="urls">the URLs from which to load classes and resources</param>
-        <summary>Constructs a new URLClassLoader for the specified URLs using the
-            default delegation parent <c>ClassLoader</c>.</summary>
+        <param name="parent">the parent class loader for delegation</param>
+        <param name="factory">the URLStreamHandlerFactory to use when creating URLs</param>
+        <summary>Constructs a new URLClassLoader for the specified URLs, parent
+            class loader, and URLStreamHandlerFactory.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLClassLoader#URLClassLoader(java.net.URL[])" title="Reference documentation">Java documentation for <code>java.net.URLClassLoader.URLClassLoader(java.net.URL[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLClassLoader#URLClassLoader(java.net.URL[],%20java.lang.ClassLoader,%20java.net.URLStreamHandlerFactory)" title="Reference documentation">Java documentation for <code>java.net.URLClassLoader.URLClassLoader(java.net.URL[], java.lang.ClassLoader, java.net.URLStreamHandlerFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -545,15 +544,15 @@
         <Parameter Name="parent" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
         <param name="urls">the URLs to search for classes and resources</param>
+        <param name="parent">the parent class loader for delegation</param>
         <summary>Creates a new instance of URLClassLoader for the specified
-            URLs and default parent class loader.</summary>
+            URLs and parent class loader.</summary>
         <returns>the resulting class loader</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLClassLoader#newInstance(java.net.URL[])" title="Reference documentation">Java documentation for <code>java.net.URLClassLoader.newInstance(java.net.URL[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLClassLoader#newInstance(java.net.URL[],%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.net.URLClassLoader.newInstance(java.net.URL[], java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URLConnection.xml b/docs/Mono.Android/en/Java.Net/URLConnection.xml
index 60a04e3d92..643a2ace6b 100644
--- a/docs/Mono.Android/en/Java.Net/URLConnection.xml
+++ b/docs/Mono.Android/en/Java.Net/URLConnection.xml
@@ -938,15 +938,18 @@
         <Parameter Name="classes" Type="Java.Lang.Class[]" />
       </Parameters>
       <Docs>
-        <param name="classes">To be added.</param>
+        <param name="classes">the <c>Class</c> array
+            indicating the requested types</param>
         <summary>Retrieves the contents of this URL connection.</summary>
-        <returns>the object fetched. The <c>instanceof</c> operator
-                          should be used to determine the specific kind of object
-                          returned.</returns>
+        <returns>the object fetched that is the first match of the type
+                          specified in the classes array. null if none of
+                          the requested types are supported.
+                          The <c>instanceof</c> operator should be used to
+                          determine the specific kind of object returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLConnection#getContent()" title="Reference documentation">Java documentation for <code>java.net.URLConnection.getContent()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLConnection#getContent(java.lang.Class[])" title="Reference documentation">Java documentation for <code>java.net.URLConnection.getContent(java.lang.Class[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1071,15 +1074,14 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="n">an index, where <c>n&gt;=0</c></param>
-        <summary>Returns the value for the <c>n</c>&lt;sup&gt;th&lt;/sup&gt; header field.</summary>
-        <returns>the value of the <c>n</c>&lt;sup&gt;th&lt;/sup&gt; header field
-                     or <c>null</c> if there are fewer than <c>n+1</c> fields</returns>
+        <param name="name">the name of a header field.</param>
+        <summary>Returns the value of the named header field.</summary>
+        <returns>the value of the named header field, or <c>null</c>
+                     if there is no such field in the header.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLConnection#getHeaderField(int)" title="Reference documentation">Java documentation for <code>java.net.URLConnection.getHeaderField(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLConnection#getHeaderField(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URLConnection.getHeaderField(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URLDecoder.xml b/docs/Mono.Android/en/Java.Net/URLDecoder.xml
index efc0c3c08d..c5d3970e50 100644
--- a/docs/Mono.Android/en/Java.Net/URLDecoder.xml
+++ b/docs/Mono.Android/en/Java.Net/URLDecoder.xml
@@ -151,14 +151,17 @@
         <Parameter Name="enc" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="enc">To be added.</param>
         <param name="s">the <c>String</c> to decode</param>
-        <summary>Decodes a <c>x-www-form-urlencoded</c> string.</summary>
+        <param name="enc">The name of a supported
+               &lt;a href="../lang/package-summary.html#charenc"&gt;character
+               encoding&lt;/a&gt;.</param>
+        <summary>Decodes a <c>application/x-www-form-urlencoded</c> string using a specific
+            encoding scheme.</summary>
         <returns>the newly decoded <c>String</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLDecoder#decode(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URLDecoder.decode(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLDecoder#decode(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URLDecoder.decode(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URLEncoder.xml b/docs/Mono.Android/en/Java.Net/URLEncoder.xml
index 7f4f5b0b78..7c4b194e83 100644
--- a/docs/Mono.Android/en/Java.Net/URLEncoder.xml
+++ b/docs/Mono.Android/en/Java.Net/URLEncoder.xml
@@ -125,16 +125,18 @@
         <Parameter Name="enc" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="enc">To be added.</param>
         <param name="s">
           <c>String</c> to be translated.</param>
-        <summary>Translates a string into <c>x-www-form-urlencoded</c>
-            format.</summary>
+        <param name="enc">The name of a supported
+               &lt;a href="../lang/package-summary.html#charenc"&gt;character
+               encoding&lt;/a&gt;.</param>
+        <summary>Translates a string into <c>application/x-www-form-urlencoded</c>
+            format using a specific encoding scheme.</summary>
         <returns>the translated <c>String</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLEncoder#encode(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URLEncoder.encode(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLEncoder#encode(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URLEncoder.encode(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/URLStreamHandler.xml b/docs/Mono.Android/en/Java.Net/URLStreamHandler.xml
index e493586b73..0e88ff5677 100644
--- a/docs/Mono.Android/en/Java.Net/URLStreamHandler.xml
+++ b/docs/Mono.Android/en/Java.Net/URLStreamHandler.xml
@@ -393,15 +393,19 @@
         <Parameter Name="p" Type="Java.Net.Proxy" />
       </Parameters>
       <Docs>
-        <param name="p">To be added.</param>
         <param name="u">the URL that this connects to.</param>
-        <summary>Opens a connection to the object referenced by the
-            <c>URL</c> argument.</summary>
+        <param name="p">the proxy through which the connection will be made.
+                            If direct connection is desired, Proxy.NO_PROXY
+                            should be specified.</param>
+        <summary>Same as openConnection(URL), except that the connection will be
+            made through the specified proxy; Protocol handlers that do not
+            support proxying will ignore the proxy parameter and make a
+            normal connection.</summary>
         <returns>a <c>URLConnection</c> object for the <c>URL</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLStreamHandler#openConnection(java.net.URL)" title="Reference documentation">Java documentation for <code>java.net.URLStreamHandler.openConnection(java.net.URL)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLStreamHandler#openConnection(java.net.URL,%20java.net.Proxy)" title="Reference documentation">Java documentation for <code>java.net.URLStreamHandler.openConnection(java.net.URL, java.net.Proxy)</code>.</a>
             </format>
           </para>
           <para>
@@ -603,21 +607,20 @@
         <Parameter Name="ref" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="authority">To be added.</param>
-        <param name="userInfo">To be added.</param>
-        <param name="path">To be added.</param>
-        <param name="query">To be added.</param>
         <param name="u">the URL to modify.</param>
-        <param name="protocol">the protocol name. This value is ignored since 1.2.</param>
+        <param name="protocol">the protocol name.</param>
         <param name="host">the remote host value for the URL.</param>
         <param name="port">the port on the remote machine.</param>
-        <param name="file">the file.</param>
+        <param name="authority">the authority part for the URL.</param>
+        <param name="userInfo">the userInfo part of the URL.</param>
+        <param name="path">the path component of the URL.</param>
+        <param name="query">the query part for the URL.</param>
         <param name="ref">the reference.</param>
         <summary>Sets the fields of the <c>URL</c> argument to the indicated values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/URLStreamHandler#setURL(java.net.URL,%20java.lang.String,%20java.lang.String,%20int,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URLStreamHandler.setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/URLStreamHandler#setURL(java.net.URL,%20java.lang.String,%20java.lang.String,%20int,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.URLStreamHandler.setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/UnknownHostException.xml b/docs/Mono.Android/en/Java.Net/UnknownHostException.xml
index a20b76596c..cf10a5aba1 100644
--- a/docs/Mono.Android/en/Java.Net/UnknownHostException.xml
+++ b/docs/Mono.Android/en/Java.Net/UnknownHostException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="host" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <summary>Constructs a new <c>UnknownHostException</c> with no detail
-            message.</summary>
+        <param name="host">the detail message.</param>
+        <summary>Constructs a new <c>UnknownHostException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/UnknownHostException#UnknownHostException()" title="Reference documentation">Java documentation for <code>java.net.UnknownHostException.UnknownHostException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/UnknownHostException#UnknownHostException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.UnknownHostException.UnknownHostException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Net/UnknownServiceException.xml b/docs/Mono.Android/en/Java.Net/UnknownServiceException.xml
index b160537781..c2e1aa2948 100644
--- a/docs/Mono.Android/en/Java.Net/UnknownServiceException.xml
+++ b/docs/Mono.Android/en/Java.Net/UnknownServiceException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a new <c>UnknownServiceException</c> with no
-            detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a new <c>UnknownServiceException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/net/UnknownServiceException#UnknownServiceException()" title="Reference documentation">Java documentation for <code>java.net.UnknownServiceException.UnknownServiceException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/net/UnknownServiceException#UnknownServiceException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.net.UnknownServiceException.UnknownServiceException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels.Spi/AsynchronousChannelProvider.xml b/docs/Mono.Android/en/Java.Nio.Channels.Spi/AsynchronousChannelProvider.xml
index b19c0e57f4..ccf4499739 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels.Spi/AsynchronousChannelProvider.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels.Spi/AsynchronousChannelProvider.xml
@@ -143,16 +143,15 @@
         <Parameter Name="initialSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
-        <param name="initialSize">To be added.</param>
-        <param name="nThreads">The number of threads in the pool</param>
-        <param name="threadFactory">The factory to use when creating new threads</param>
-        <summary>Constructs a new asynchronous channel group with a fixed thread pool.</summary>
+        <param name="executor">The thread pool</param>
+        <param name="initialSize">A value <c>&gt;=0</c> or a negative value for implementation
+                     specific default</param>
+        <summary>Constructs a new asynchronous channel group with the given thread pool.</summary>
         <returns>A new asynchronous channel group</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider#openAsynchronousChannelGroup(int,%20java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.nio.channels.spi.AsynchronousChannelProvider.openAsynchronousChannelGroup(int, java.util.concurrent.ThreadFactory)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider#openAsynchronousChannelGroup(java.util.concurrent.ExecutorService,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.spi.AsynchronousChannelProvider.openAsynchronousChannelGroup(java.util.concurrent.ExecutorService, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels.Spi/SelectorProvider.xml b/docs/Mono.Android/en/Java.Nio.Channels.Spi/SelectorProvider.xml
index a6f80736b1..13e1862d43 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels.Spi/SelectorProvider.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels.Spi/SelectorProvider.xml
@@ -225,13 +225,13 @@
         <Parameter Name="family" Type="Java.Net.IProtocolFamily" />
       </Parameters>
       <Docs>
-        <param name="family">To be added.</param>
+        <param name="family">The protocol family</param>
         <summary>Opens a datagram channel.</summary>
-        <returns>The new channel</returns>
+        <returns>A new datagram channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider#openDatagramChannel()" title="Reference documentation">Java documentation for <code>java.nio.channels.spi.SelectorProvider.openDatagramChannel()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider#openDatagramChannel(java.net.ProtocolFamily)" title="Reference documentation">Java documentation for <code>java.nio.channels.spi.SelectorProvider.openDatagramChannel(java.net.ProtocolFamily)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousFileChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousFileChannel.xml
index b495da5303..447b5c35d3 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousFileChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousFileChannel.xml
@@ -318,14 +318,15 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
         <summary>Acquires an exclusive lock on this channel's file.</summary>
         <returns>a <c>Future</c> object representing the pending result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#lock()" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.lock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#lock(java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.lock(java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -361,15 +362,21 @@
         <Parameter Name="shared" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="position">To be added.</param>
-        <param name="size">To be added.</param>
-        <param name="shared">To be added.</param>
-        <summary>Acquires an exclusive lock on this channel's file.</summary>
+        <param name="position">The position at which the locked region is to start; must be
+                     non-negative</param>
+        <param name="size">The size of the locked region; must be non-negative, and the sum
+                     <c>position</c>&amp;nbsp;+&amp;nbsp;<c>size</c> must be non-negative</param>
+        <param name="shared">
+          <c>true</c> to request a shared lock, in which case this
+                     channel must be open for reading (and possibly writing);
+                     <c>false</c> to request an exclusive lock, in which case this
+                     channel must be open for writing (and possibly reading)</param>
+        <summary>Acquires a lock on the given region of this channel's file.</summary>
         <returns>a <c>Future</c> object representing the pending result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#lock()" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.lock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#lock(long,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.lock(long, long, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -411,17 +418,24 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="position">To be added.</param>
-        <param name="size">To be added.</param>
-        <param name="shared">To be added.</param>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
-        <summary>Acquires an exclusive lock on this channel's file.</summary>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
+        <param name="position">The position at which the locked region is to start; must be
+                     non-negative</param>
+        <param name="size">The size of the locked region; must be non-negative, and the sum
+                     <c>position</c>&amp;nbsp;+&amp;nbsp;<c>size</c> must be non-negative</param>
+        <param name="shared">
+          <c>true</c> to request a shared lock, in which case this
+                     channel must be open for reading (and possibly writing);
+                     <c>false</c> to request an exclusive lock, in which case this
+                     channel must be open for writing (and possibly reading)</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
+        <summary>Acquires a lock on the given region of this channel's file.</summary>
         <returns>a <c>Future</c> object representing the pending result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#lock()" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.lock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#lock(long,%20long,%20boolean,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.lock(long, long, boolean, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -515,10 +529,10 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
-        <param name="attrs">To be added.</param>
         <param name="file">The path of the file to open or create</param>
         <param name="options">Options specifying how the file is opened</param>
+        <param name="executor">To be added.</param>
+        <param name="attrs">To be added.</param>
         <summary>Opens or creates a file for reading and/or writing, returning an
             asynchronous file channel to access the file.</summary>
         <returns>A new asynchronous file channel</returns>
@@ -610,18 +624,19 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
         <param name="dst">The buffer into which bytes are to be transferred</param>
         <param name="position">The file position at which the transfer is to begin;
                      must be non-negative</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
         <summary>Reads a sequence of bytes from this channel into the given buffer,
             starting at the given file position.</summary>
         <returns>A <c>Future</c> object representing the pending result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#read(java.nio.ByteBuffer,%20long)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.read(java.nio.ByteBuffer, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#read(java.nio.ByteBuffer,%20long,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.read(java.nio.ByteBuffer, long, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -835,17 +850,21 @@
         <Parameter Name="shared" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="position">To be added.</param>
-        <param name="size">To be added.</param>
-        <param name="shared">To be added.</param>
-        <summary>Attempts to acquire an exclusive lock on this channel's file.</summary>
+        <param name="position">The position at which the locked region is to start; must be
+                    non-negative</param>
+        <param name="size">The size of the locked region; must be non-negative, and the sum
+                    <c>position</c>&amp;nbsp;+&amp;nbsp;<c>size</c> must be non-negative</param>
+        <param name="shared">
+          <c>true</c> to request a shared lock,
+                    <c>false</c> to request an exclusive lock</param>
+        <summary>Attempts to acquire a lock on the given region of this channel's file.</summary>
         <returns>A lock object representing the newly-acquired lock,
                      or <c>null</c> if the lock could not be acquired
                      because another program holds an overlapping lock</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#tryLock()" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.tryLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#tryLock(long,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.tryLock(long, long, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -930,18 +949,19 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
         <param name="src">The buffer from which bytes are to be transferred</param>
         <param name="position">The file position at which the transfer is to begin;
                      must be non-negative</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
         <summary>Writes a sequence of bytes to this channel from the given buffer, starting
             at the given file position.</summary>
         <returns>A <c>Future</c> object representing the pending result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#write(java.nio.ByteBuffer,%20long)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.write(java.nio.ByteBuffer, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel#write(java.nio.ByteBuffer,%20long,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousFileChannel.write(java.nio.ByteBuffer, long, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousServerSocketChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousServerSocketChannel.xml
index fdf9441af2..8cd6d989e6 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousServerSocketChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousServerSocketChannel.xml
@@ -176,14 +176,15 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
         <summary>Accepts a connection.</summary>
         <returns>a <c>Future</c> object representing the pending result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel#accept()" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousServerSocketChannel.accept()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel#accept(java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousServerSocketChannel.accept(java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -260,16 +261,16 @@
         <Parameter Name="backlog" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="backlog">To be added.</param>
         <param name="local">The local address to bind the socket, or <c>null</c> to bind
                      to an automatically assigned socket address</param>
+        <param name="backlog">The maximum number of pending connections</param>
         <summary>Binds the channel's socket to a local address and configures the socket to
             listen for connections.</summary>
         <returns>This channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel#bind(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousServerSocketChannel.bind(java.net.SocketAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel#bind(java.net.SocketAddress,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousServerSocketChannel.bind(java.net.SocketAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -470,13 +471,14 @@
         <Parameter Name="group" Type="Java.Nio.Channels.AsynchronousChannelGroup" />
       </Parameters>
       <Docs>
-        <param name="group">To be added.</param>
+        <param name="group">The group to which the newly constructed channel should be bound,
+                     or <c>null</c> for the default group</param>
         <summary>Opens an asynchronous server-socket channel.</summary>
         <returns>A new asynchronous server socket channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel#open()" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousServerSocketChannel.open()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel#open(java.nio.channels.AsynchronousChannelGroup)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousServerSocketChannel.open(java.nio.channels.AsynchronousChannelGroup)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousSocketChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousSocketChannel.xml
index 88b48a6f20..f4bda1db92 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousSocketChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/AsynchronousSocketChannel.xml
@@ -262,15 +262,16 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
         <param name="remote">The remote address to which this channel is to be connected</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
         <summary>Connects this channel.</summary>
         <returns>A <c>Future</c> object representing the pending result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#connect(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.connect(java.net.SocketAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#connect(java.net.SocketAddress,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.connect(java.net.SocketAddress, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -432,13 +433,14 @@
         <Parameter Name="group" Type="Java.Nio.Channels.AsynchronousChannelGroup" />
       </Parameters>
       <Docs>
-        <param name="group">To be added.</param>
+        <param name="group">The group to which the newly constructed channel should be bound,
+                     or <c>null</c> for the default group</param>
         <summary>Opens an asynchronous socket channel.</summary>
         <returns>A new asynchronous socket channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#open()" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.open()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#open(java.nio.channels.AsynchronousChannelGroup)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.open(java.nio.channels.AsynchronousChannelGroup)</code>.</a>
             </format>
           </para>
           <para>
@@ -568,7 +570,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#read(java.nio.ByteBuffer,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.read(java.nio.ByteBuffer, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -610,16 +612,17 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="dst">To be added.</param>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
+        <param name="dst">The buffer into which bytes are to be transferred</param>
+        <param name="timeout">The maximum time for the I/O operation to complete</param>
+        <param name="unit">The time unit of the <c>timeout</c> argument</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
+        <summary>Reads a sequence of bytes from this channel into the given buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#read(java.nio.ByteBuffer,%20long,%20java.util.concurrent.TimeUnit,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.read(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -663,18 +666,23 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="dsts">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
+        <param name="dsts">The buffers into which bytes are to be transferred</param>
+        <param name="offset">The offset within the buffer array of the first buffer into which
+                     bytes are to be transferred; must be non-negative and no larger than
+                     <c>dsts.length</c></param>
+        <param name="length">The maximum number of buffers to be accessed; must be non-negative
+                     and no larger than <c>dsts.length - offset</c></param>
+        <param name="timeout">The maximum time for the I/O operation to complete</param>
+        <param name="unit">The time unit of the <c>timeout</c> argument</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
+        <summary>Reads a sequence of bytes from this channel into a subsequence of the
+            given buffers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#read(java.nio.ByteBuffer[],%20int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.read(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -976,7 +984,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#write(java.nio.ByteBuffer,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.write(java.nio.ByteBuffer, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -1018,16 +1026,17 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
+        <param name="src">The buffer from which bytes are to be retrieved</param>
+        <param name="timeout">The maximum time for the I/O operation to complete</param>
+        <param name="unit">The time unit of the <c>timeout</c> argument</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
+        <summary>Writes a sequence of bytes to this channel from the given buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#write(java.nio.ByteBuffer,%20long,%20java.util.concurrent.TimeUnit,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.write(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -1071,18 +1080,23 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="srcs">To be added.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
+        <param name="srcs">The buffers from which bytes are to be retrieved</param>
+        <param name="offset">The offset within the buffer array of the first buffer from which
+                     bytes are to be retrieved; must be non-negative and no larger
+                     than <c>srcs.length</c></param>
+        <param name="length">The maximum number of buffers to be accessed; must be non-negative
+                     and no larger than <c>srcs.length - offset</c></param>
+        <param name="timeout">The maximum time for the I/O operation to complete</param>
+        <param name="unit">The time unit of the <c>timeout</c> argument</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The handler for consuming the result</param>
+        <summary>Writes a sequence of bytes to this channel from a subsequence of the given
+            buffers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel#write(java.nio.ByteBuffer[],%20int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousSocketChannel.write(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/Channels.xml b/docs/Mono.Android/en/Java.Nio.Channels/Channels.xml
index d16a31e0eb..cba94ba1e5 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/Channels.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/Channels.xml
@@ -134,7 +134,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newInputStream(java.nio.channels.AsynchronousByteChannel)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newInputStream(java.nio.channels.AsynchronousByteChannel)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newInputStream(java.nio.channels.ReadableByteChannel)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newInputStream(java.nio.channels.ReadableByteChannel)</code>.</a>
             </format>
           </para>
           <para>
@@ -215,7 +215,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newOutputStream(java.nio.channels.AsynchronousByteChannel)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newOutputStream(java.nio.channels.AsynchronousByteChannel)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newOutputStream(java.nio.channels.WritableByteChannel)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newOutputStream(java.nio.channels.WritableByteChannel)</code>.</a>
             </format>
           </para>
           <para>
@@ -339,17 +339,18 @@
         <Parameter Name="minBufferCap" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dec">To be added.</param>
-        <param name="minBufferCap">To be added.</param>
         <param name="ch">The channel from which bytes will be read</param>
-        <param name="csName">The name of the charset to be used</param>
-        <summary>Constructs a reader that decodes bytes from the given channel according
-            to the named charset.</summary>
+        <param name="dec">The charset decoder to be used</param>
+        <param name="minBufferCap">The minimum capacity of the internal byte buffer,
+                    or <c>-1</c> if an implementation-dependent
+                    default capacity is to be used</param>
+        <summary>Constructs a reader that decodes bytes from the given channel using the
+            given decoder.</summary>
         <returns>A new reader</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newReader(java.nio.channels.ReadableByteChannel,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newReader(java.nio.channels.ReadableByteChannel, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newReader(java.nio.channels.ReadableByteChannel,%20java.nio.charset.CharsetDecoder,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newReader(java.nio.channels.ReadableByteChannel, java.nio.charset.CharsetDecoder, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -384,14 +385,13 @@
         <Parameter Name="out" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="in">The stream from which bytes are to be read</param>
-        <summary>Constructs a channel that reads bytes from the given stream.</summary>
-        <returns>A new readable byte channel</returns>
+        <param name="out">The stream to which bytes are to be written</param>
+        <summary>Constructs a channel that writes bytes to the given stream.</summary>
+        <returns>A new writable byte channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newChannel(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newChannel(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newChannel(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newChannel(java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -474,17 +474,18 @@
         <Parameter Name="minBufferCap" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="enc">To be added.</param>
-        <param name="minBufferCap">To be added.</param>
         <param name="ch">The channel to which bytes will be written</param>
-        <param name="csName">The name of the charset to be used</param>
-        <summary>Constructs a writer that encodes characters according to the named
-            charset and writes the resulting bytes to the given channel.</summary>
+        <param name="enc">The charset encoder to be used</param>
+        <param name="minBufferCap">The minimum capacity of the internal byte buffer,
+                    or <c>-1</c> if an implementation-dependent
+                    default capacity is to be used</param>
+        <summary>Constructs a writer that encodes characters using the given encoder and
+            writes the resulting bytes to the given channel.</summary>
         <returns>A new writer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newWriter(java.nio.channels.WritableByteChannel,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newWriter(java.nio.channels.WritableByteChannel, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/Channels#newWriter(java.nio.channels.WritableByteChannel,%20java.nio.charset.CharsetEncoder,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.Channels.newWriter(java.nio.channels.WritableByteChannel, java.nio.charset.CharsetEncoder, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/DatagramChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/DatagramChannel.xml
index 1e70b34129..7baee627dd 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/DatagramChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/DatagramChannel.xml
@@ -431,13 +431,13 @@
         <Parameter Name="family" Type="Java.Net.IProtocolFamily" />
       </Parameters>
       <Docs>
-        <param name="family">To be added.</param>
+        <param name="family">The protocol family</param>
         <summary>Opens a datagram channel.</summary>
         <returns>A new datagram channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#open()" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.open()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#open(java.net.ProtocolFamily)" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.open(java.net.ProtocolFamily)</code>.</a>
             </format>
           </para>
           <para>
@@ -534,7 +534,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#read(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.read(java.nio.ByteBuffer[])</code>.</a>
             </format>
           </para>
           <para>
@@ -596,7 +596,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#read(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.read(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1077,11 +1077,15 @@
       <Docs>
         <param name="srcs">To be added.</param>
         <summary>Writes a datagram to this channel.</summary>
-        <returns>To be added.</returns>
+        <returns>The number of bytes sent, which will be either the number
+                      of bytes that were remaining in the source buffer when this
+                      method was invoked or, if this channel is non-blocking, may be
+                      zero if there was insufficient room for the datagram in the
+                      underlying output buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#write(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.write(java.nio.ByteBuffer[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1139,11 +1143,15 @@
             buffers to be submitted, must be no bigger than
             <c>sources.length - offset</c>.</param>
         <summary>Writes a datagram to this channel.</summary>
-        <returns>To be added.</returns>
+        <returns>The number of bytes sent, which will be either the number
+                      of bytes that were remaining in the source buffer when this
+                      method was invoked or, if this channel is non-blocking, may be
+                      zero if there was insufficient room for the datagram in the
+                      underlying output buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/DatagramChannel#write(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.DatagramChannel.write(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/FileChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/FileChannel.xml
index c8a5037ebe..45fa0d7b32 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/FileChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/FileChannel.xml
@@ -361,16 +361,21 @@
         <Parameter Name="shared" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="position">the starting position for the locked region.</param>
-        <param name="size">the length of the locked region in bytes.</param>
-        <param name="shared">a flag indicating whether an attempt should be made to acquire
-            a shared lock.</param>
-        <summary>Acquires an exclusive lock on this channel's file.</summary>
+        <param name="position">The position at which the locked region is to start; must be
+                    non-negative</param>
+        <param name="size">The size of the locked region; must be non-negative, and the sum
+                    <c>position</c>&amp;nbsp;+&amp;nbsp;<c>size</c> must be non-negative</param>
+        <param name="shared">
+          <c>true</c> to request a shared lock, in which case this
+                    channel must be open for reading (and possibly writing);
+                    <c>false</c> to request an exclusive lock, in which case this
+                    channel must be open for writing (and possibly reading)</param>
+        <summary>Acquires a lock on the given region of this channel's file.</summary>
         <returns>A lock object representing the newly-acquired lock</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#lock()" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.lock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#lock(long,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.lock(long, long, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -535,9 +540,9 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="path">The path of the file to open or create</param>
         <param name="options">Options specifying how the file is opened</param>
+        <param name="attrs">To be added.</param>
         <summary>Opens or creates a file, returning a file channel to access the file.</summary>
         <returns>A new file channel</returns>
         <remarks>
@@ -623,15 +628,14 @@
         <Parameter Name="newPosition" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="newPosition">the new file position, in bytes.</param>
-        <summary>Returns this channel's file position.</summary>
-        <returns>This channel's file position,
-                     a non-negative integer counting the number of bytes
-                     from the beginning of the file to the current position</returns>
+        <param name="newPosition">The new position, a non-negative integer counting
+                    the number of bytes from the beginning of the file</param>
+        <summary>Sets this channel's file position.</summary>
+        <returns>This file channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#position()" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.position()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#position(long)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.position(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -727,12 +731,12 @@
       </Parameters>
       <Docs>
         <param name="dsts">To be added.</param>
-        <summary>Reads a sequence of bytes from this channel into the given buffer.</summary>
+        <summary>Reads a sequence of bytes from this channel into the given buffers.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#read(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.read(java.nio.ByteBuffer[])</code>.</a>
             </format>
           </para>
           <para>
@@ -777,14 +781,18 @@
         <Parameter Name="position" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="dst">To be added.</param>
-        <param name="position">the (non-negative) position at which to read the bytes.</param>
-        <summary>Reads a sequence of bytes from this channel into the given buffer.</summary>
-        <returns>To be added.</returns>
+        <param name="dst">The buffer into which bytes are to be transferred</param>
+        <param name="position">The file position at which the transfer is to begin;
+                    must be non-negative</param>
+        <summary>Reads a sequence of bytes from this channel into the given buffer,
+            starting at the given file position.</summary>
+        <returns>The number of bytes read, possibly zero, or <c>-1</c> if the
+                     given position is greater than or equal to the file's current
+                     size</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#read(java.nio.ByteBuffer,%20long)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.read(java.nio.ByteBuffer, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -838,12 +846,13 @@
         <param name="dsts">To be added.</param>
         <param name="offset">To be added.</param>
         <param name="length">To be added.</param>
-        <summary>Reads a sequence of bytes from this channel into the given buffer.</summary>
+        <summary>Reads a sequence of bytes from this channel into a subsequence of the
+            given buffers.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#read(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.read(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1395,17 +1404,21 @@
         <Parameter Name="shared" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="position">the starting position.</param>
-        <param name="size">the size of file to lock.</param>
-        <param name="shared">true if the lock is shared.</param>
-        <summary>Attempts to acquire an exclusive lock on this channel's file.</summary>
+        <param name="position">The position at which the locked region is to start; must be
+                    non-negative</param>
+        <param name="size">The size of the locked region; must be non-negative, and the sum
+                    <c>position</c>&amp;nbsp;+&amp;nbsp;<c>size</c> must be non-negative</param>
+        <param name="shared">
+          <c>true</c> to request a shared lock,
+                    <c>false</c> to request an exclusive lock</param>
+        <summary>Attempts to acquire a lock on the given region of this channel's file.</summary>
         <returns>A lock object representing the newly-acquired lock,
                      or <c>null</c> if the lock could not be acquired
                      because another program holds an overlapping lock</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#tryLock()" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.tryLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#tryLock(long,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.tryLock(long, long, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1504,12 +1517,12 @@
       </Parameters>
       <Docs>
         <param name="srcs">To be added.</param>
-        <summary>Writes a sequence of bytes to this channel from the given buffer.</summary>
+        <summary>Writes a sequence of bytes to this channel from the given buffers.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#write(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.write(java.nio.ByteBuffer[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1554,14 +1567,16 @@
         <Parameter Name="position" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="position">the (non-negative) position at which to write the bytes.</param>
-        <summary>Writes a sequence of bytes to this channel from the given buffer.</summary>
-        <returns>To be added.</returns>
+        <param name="src">The buffer from which bytes are to be transferred</param>
+        <param name="position">The file position at which the transfer is to begin;
+                    must be non-negative</param>
+        <summary>Writes a sequence of bytes to this channel from the given buffer,
+            starting at the given file position.</summary>
+        <returns>The number of bytes written, possibly zero</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#write(java.nio.ByteBuffer,%20long)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.write(java.nio.ByteBuffer, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1615,12 +1630,13 @@
         <param name="offset">the index of the first buffer in <c>buffers </c>to get bytes
             from.</param>
         <param name="length">the number of buffers to get bytes from.</param>
-        <summary>Writes a sequence of bytes to this channel from the given buffer.</summary>
+        <summary>Writes a sequence of bytes to this channel from a subsequence of the
+            given buffers.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileChannel#write(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileChannel.write(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/FileLock.xml b/docs/Mono.Android/en/Java.Nio.Channels/FileLock.xml
index 0c7769ae8a..c9b8175b2d 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/FileLock.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/FileLock.xml
@@ -139,7 +139,7 @@
         <Parameter Name="shared" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="channel">The channel upon whose file this lock is held</param>
+        <param name="channel">The file channel upon whose file this lock is held</param>
         <param name="position">The position within the file at which the locked region starts;
                     must be non-negative</param>
         <param name="size">The size of the locked region; must be non-negative, and the sum
@@ -151,7 +151,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/FileLock#FileLock(java.nio.channels.AsynchronousFileChannel,%20long,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileLock.FileLock(java.nio.channels.AsynchronousFileChannel, long, long, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/FileLock#FileLock(java.nio.channels.FileChannel,%20long,%20long,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.channels.FileLock.FileLock(java.nio.channels.FileChannel, long, long, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/IAsynchronousByteChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/IAsynchronousByteChannel.xml
index 3a515b8538..65af94343b 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/IAsynchronousByteChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/IAsynchronousByteChannel.xml
@@ -118,15 +118,16 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
         <param name="dst">The buffer into which bytes are to be transferred</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The completion handler</param>
         <summary>Reads a sequence of bytes from this channel into the given buffer.</summary>
         <returns>A Future representing the result of the operation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousByteChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel#read(java.nio.ByteBuffer,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousByteChannel.read(java.nio.ByteBuffer, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -206,15 +207,16 @@
         <Parameter Name="handler" Type="Java.Nio.Channels.ICompletionHandler" />
       </Parameters>
       <Docs>
-        <param name="attachment">To be added.</param>
-        <param name="handler">To be added.</param>
+        <param name="&lt;A&gt;&lt;A&gt;">The type of the attachment</param>
         <param name="src">The buffer from which bytes are to be retrieved</param>
+        <param name="attachment">The object to attach to the I/O operation; can be <c>null</c></param>
+        <param name="handler">The completion handler object</param>
         <summary>Writes a sequence of bytes to this channel from the given buffer.</summary>
         <returns>A Future representing the result of the operation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousByteChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel#write(java.nio.ByteBuffer,%20java.lang.Object,%20java.nio.channels.CompletionHandler)" title="Reference documentation">Java documentation for <code>java.nio.channels.AsynchronousByteChannel.write(java.nio.ByteBuffer, java.lang.Object, java.nio.channels.CompletionHandler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/IGatheringByteChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/IGatheringByteChannel.xml
index f257358098..25b6a23c83 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/IGatheringByteChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/IGatheringByteChannel.xml
@@ -129,16 +129,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the index of the first buffer in <c>buffers </c>to get bytes
-            from.</param>
-        <param name="length">the number of buffers to get bytes from.</param>
         <param name="srcs">The buffers from which bytes are to be retrieved</param>
-        <summary>Writes a sequence of bytes to this channel from the given buffers.</summary>
+        <param name="offset">The offset within the buffer array of the first buffer from
+                    which bytes are to be retrieved; must be non-negative and no
+                    larger than <c>srcs.length</c></param>
+        <param name="length">The maximum number of buffers to be accessed; must be
+                    non-negative and no larger than
+                    <c>srcs.length</c>&amp;nbsp;-&amp;nbsp;<c>offset</c></param>
+        <summary>Writes a sequence of bytes to this channel from a subsequence of the
+            given buffers.</summary>
         <returns>The number of bytes written, possibly zero</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/GatheringByteChannel#write(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.GatheringByteChannel.write(java.nio.ByteBuffer[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/GatheringByteChannel#write(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.GatheringByteChannel.write(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/IScatteringByteChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/IScatteringByteChannel.xml
index c892b237d7..c06af586c3 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/IScatteringByteChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/IScatteringByteChannel.xml
@@ -127,16 +127,21 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the index of the first buffer to store bytes in.</param>
-        <param name="length">the maximum number of buffers to store bytes in.</param>
         <param name="dsts">The buffers into which bytes are to be transferred</param>
-        <summary>Reads a sequence of bytes from this channel into the given buffers.</summary>
+        <param name="offset">The offset within the buffer array of the first buffer into
+                    which bytes are to be transferred; must be non-negative and no
+                    larger than <c>dsts.length</c></param>
+        <param name="length">The maximum number of buffers to be accessed; must be
+                    non-negative and no larger than
+                    <c>dsts.length</c>&amp;nbsp;-&amp;nbsp;<c>offset</c></param>
+        <summary>Reads a sequence of bytes from this channel into a subsequence of the
+            given buffers.</summary>
         <returns>The number of bytes read, possibly zero,
                     or <c>-1</c> if the channel has reached end-of-stream</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/ScatteringByteChannel#read(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.ScatteringByteChannel.read(java.nio.ByteBuffer[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/ScatteringByteChannel#read(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.ScatteringByteChannel.read(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/ISeekableByteChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/ISeekableByteChannel.xml
index ecb84ef4da..317b0dea09 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/ISeekableByteChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/ISeekableByteChannel.xml
@@ -118,15 +118,14 @@
         <Parameter Name="newPosition" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="newPosition">To be added.</param>
-        <summary>Returns this channel's position.</summary>
-        <returns>This channel's position,
-                     a non-negative integer counting the number of bytes
-                     from the beginning of the entity to the current position</returns>
+        <param name="newPosition">The new position, a non-negative integer counting
+                    the number of bytes from the beginning of the entity</param>
+        <summary>Sets this channel's position.</summary>
+        <returns>This channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel#position()" title="Reference documentation">Java documentation for <code>java.nio.channels.SeekableByteChannel.position()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel#position(long)" title="Reference documentation">Java documentation for <code>java.nio.channels.SeekableByteChannel.position(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SinkChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SinkChannel.xml
index b19173c923..b8443b8b14 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SinkChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SinkChannel.xml
@@ -348,15 +348,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
         <param name="srcs">The buffers from which bytes are to be retrieved</param>
-        <summary>Writes a sequence of bytes to this channel from the given buffers.</summary>
+        <param name="offset">The offset within the buffer array of the first buffer from
+                    which bytes are to be retrieved; must be non-negative and no
+                    larger than <c>srcs.length</c></param>
+        <param name="length">The maximum number of buffers to be accessed; must be
+                    non-negative and no larger than
+                    <c>srcs.length</c>&amp;nbsp;-&amp;nbsp;<c>offset</c></param>
+        <summary>Writes a sequence of bytes to this channel from a subsequence of the
+            given buffers.</summary>
         <returns>The number of bytes written, possibly zero</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/GatheringByteChannel#write(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.GatheringByteChannel.write(java.nio.ByteBuffer[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/GatheringByteChannel#write(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.GatheringByteChannel.write(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SourceChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SourceChannel.xml
index 1e976b93bd..d64dfca02c 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SourceChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/Pipe+SourceChannel.xml
@@ -253,16 +253,21 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
         <param name="dsts">The buffers into which bytes are to be transferred</param>
-        <summary>Reads a sequence of bytes from this channel into the given buffers.</summary>
+        <param name="offset">The offset within the buffer array of the first buffer into
+                    which bytes are to be transferred; must be non-negative and no
+                    larger than <c>dsts.length</c></param>
+        <param name="length">The maximum number of buffers to be accessed; must be
+                    non-negative and no larger than
+                    <c>dsts.length</c>&amp;nbsp;-&amp;nbsp;<c>offset</c></param>
+        <summary>Reads a sequence of bytes from this channel into a subsequence of the
+            given buffers.</summary>
         <returns>The number of bytes read, possibly zero,
                     or <c>-1</c> if the channel has reached end-of-stream</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/ScatteringByteChannel#read(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.ScatteringByteChannel.read(java.nio.ByteBuffer[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/ScatteringByteChannel#read(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.ScatteringByteChannel.read(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/SelectableChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/SelectableChannel.xml
index eb09755d28..8cba6f7e46 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/SelectableChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/SelectableChannel.xml
@@ -456,9 +456,9 @@
         <Parameter Name="att" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="att">the object to attach, can be <c>null</c>.</param>
         <param name="sel">The selector with which this channel is to be registered</param>
         <param name="ops">The interest set for the resulting key</param>
+        <param name="att">The attachment for the resulting key; may be <c>null</c></param>
         <summary>Registers this channel with the given selector, returning a selection
             key.</summary>
         <returns>A key representing the registration of this channel with
@@ -466,7 +466,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/SelectableChannel#register(java.nio.channels.Selector,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.SelectableChannel.register(java.nio.channels.Selector, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/SelectableChannel#register(java.nio.channels.Selector,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.nio.channels.SelectableChannel.register(java.nio.channels.Selector, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/Selector.xml b/docs/Mono.Android/en/Java.Nio.Channels/Selector.xml
index 0441dcb349..16fb7dfb93 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/Selector.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/Selector.xml
@@ -389,8 +389,10 @@
         <Parameter Name="timeout" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="timeout">the non-negative timeout in millisecond; 0 will block forever
-            if no channels get ready.</param>
+        <param name="timeout">If positive, block for up to <c>timeout</c>
+                             milliseconds, more or less, while waiting for a
+                             channel to become ready; if zero, block indefinitely;
+                             must not be negative</param>
         <summary>Selects a set of keys whose corresponding channels are ready for I/O
             operations.</summary>
         <returns>The number of keys, possibly zero,
@@ -398,7 +400,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/Selector#select()" title="Reference documentation">Java documentation for <code>java.nio.channels.Selector.select()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/Selector#select(long)" title="Reference documentation">Java documentation for <code>java.nio.channels.Selector.select(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/ServerSocketChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/ServerSocketChannel.xml
index 66baa7a23a..833456f8bc 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/ServerSocketChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/ServerSocketChannel.xml
@@ -231,16 +231,16 @@
         <Parameter Name="backlog" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="backlog">To be added.</param>
-        <param name="local">The local address to bind the socket, or <c>null</c> to bind
-                     to an automatically assigned socket address</param>
-        <summary>Binds the channel's socket to a local address and configures the socket
-            to listen for connections.</summary>
+        <param name="local">The address to bind the socket, or <c>null</c> to bind to an
+                     automatically assigned socket address</param>
+        <param name="backlog">The maximum number of pending connections</param>
+        <summary>Binds the channel's socket to a local address and configures the socket to
+            listen for connections.</summary>
         <returns>This channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel#bind(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.nio.channels.ServerSocketChannel.bind(java.net.SocketAddress)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel#bind(java.net.SocketAddress,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.ServerSocketChannel.bind(java.net.SocketAddress, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Channels/SocketChannel.xml b/docs/Mono.Android/en/Java.Nio.Channels/SocketChannel.xml
index 4f9c220b8c..d5e12f2bbf 100644
--- a/docs/Mono.Android/en/Java.Nio.Channels/SocketChannel.xml
+++ b/docs/Mono.Android/en/Java.Nio.Channels/SocketChannel.xml
@@ -499,13 +499,13 @@
         <Parameter Name="remote" Type="Java.Net.SocketAddress" />
       </Parameters>
       <Docs>
-        <param name="remote">To be added.</param>
-        <summary>Opens a socket channel.</summary>
-        <returns>A new socket channel</returns>
+        <param name="remote">The remote address to which the new channel is to be connected</param>
+        <summary>Opens a socket channel and connects it to a remote address.</summary>
+        <returns>A new, and connected, socket channel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#open()" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.open()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#open(java.net.SocketAddress)" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.open(java.net.SocketAddress)</code>.</a>
             </format>
           </para>
           <para>
@@ -611,7 +611,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#read(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.read(java.nio.ByteBuffer[])</code>.</a>
             </format>
           </para>
           <para>
@@ -668,7 +668,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#read(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.read(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#read(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.read(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1067,7 +1067,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#write(java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.write(java.nio.ByteBuffer[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1126,7 +1126,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#write(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.write(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/channels/SocketChannel#write(java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.channels.SocketChannel.write(java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Charset/Charset.xml b/docs/Mono.Android/en/Java.Nio.Charset/Charset.xml
index d73711d112..dee9b70762 100644
--- a/docs/Mono.Android/en/Java.Nio.Charset/Charset.xml
+++ b/docs/Mono.Android/en/Java.Nio.Charset/Charset.xml
@@ -456,13 +456,13 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
-        <summary>Returns this charset's human-readable name for the default locale.</summary>
-        <returns>The display name of this charset in the default locale</returns>
+        <param name="locale">The locale for which the display name is to be retrieved</param>
+        <summary>Returns this charset's human-readable name for the given locale.</summary>
+        <returns>The display name of this charset in the given locale</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/charset/Charset#displayName()" title="Reference documentation">Java documentation for <code>java.nio.charset.Charset.displayName()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/charset/Charset#displayName(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.nio.charset.Charset.displayName(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -497,14 +497,14 @@
         <Parameter Name="cb" Type="Java.Nio.CharBuffer" />
       </Parameters>
       <Docs>
-        <param name="cb">To be added.</param>
-        <param name="str">The string to be encoded</param>
-        <summary>Convenience method that encodes a string into bytes in this charset.</summary>
+        <param name="cb">The char buffer to be encoded</param>
+        <summary>Convenience method that encodes Unicode characters into bytes in this
+            charset.</summary>
         <returns>A byte buffer containing the encoded characters</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/charset/Charset#encode(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.charset.Charset.encode(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/charset/Charset#encode(java.nio.CharBuffer)" title="Reference documentation">Java documentation for <code>java.nio.charset.Charset.encode(java.nio.CharBuffer)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Charset/CharsetDecoder.xml b/docs/Mono.Android/en/Java.Nio.Charset/CharsetDecoder.xml
index b104494f97..214db7e890 100644
--- a/docs/Mono.Android/en/Java.Nio.Charset/CharsetDecoder.xml
+++ b/docs/Mono.Android/en/Java.Nio.Charset/CharsetDecoder.xml
@@ -263,18 +263,18 @@
         <Parameter Name="endOfInput" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="out">the output buffer.</param>
-        <param name="endOfInput">true if all the input characters have been provided.</param>
         <param name="in">The input byte buffer</param>
-        <summary>Convenience method that decodes the remaining content of a single input
-            byte buffer into a newly-allocated character buffer.</summary>
-        <returns>A newly-allocated character buffer containing the result of the
-                    decoding operation.  The buffer's position will be zero and its
-                    limit will follow the last character written.</returns>
+        <param name="out">The output character buffer</param>
+        <param name="endOfInput">
+          <c>true</c> if, and only if, the invoker can provide no
+                    additional input bytes beyond those in the given buffer</param>
+        <summary>Decodes as many bytes as possible from the given input buffer,
+            writing the results to the given output buffer.</summary>
+        <returns>A coder-result object describing the reason for termination</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder#decode(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetDecoder.decode(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder#decode(java.nio.ByteBuffer,%20java.nio.CharBuffer,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetDecoder.decode(java.nio.ByteBuffer, java.nio.CharBuffer, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.Charset/CharsetEncoder.xml b/docs/Mono.Android/en/Java.Nio.Charset/CharsetEncoder.xml
index 441134baf2..d30ef4dfae 100644
--- a/docs/Mono.Android/en/Java.Nio.Charset/CharsetEncoder.xml
+++ b/docs/Mono.Android/en/Java.Nio.Charset/CharsetEncoder.xml
@@ -109,15 +109,26 @@
         <Parameter Name="replacement" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="cs">To be added.</param>
-        <param name="averageBytesPerChar">To be added.</param>
-        <param name="maxBytesPerChar">To be added.</param>
-        <param name="replacement">To be added.</param>
-        <summary>Constructs a new <c>CharsetEncoder</c> using the given
- <c>Charset</c>, replacement byte array, average number and
- maximum number of bytes created by this encoder for one input character.</summary>
+        <param name="cs">The charset that created this encoder</param>
+        <param name="averageBytesPerChar">A positive float value indicating the expected number of
+                    bytes that will be produced for each input character</param>
+        <param name="maxBytesPerChar">A positive float value indicating the maximum number of
+                    bytes that will be produced for each input character</param>
+        <param name="replacement">The initial replacement; must not be <c>null</c>, must have
+                    non-zero length, must not be longer than maxBytesPerChar,
+                    and must be #isLegalReplacement legal</param>
+        <summary>Initializes a new encoder.</summary>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder#CharsetEncoder(java.nio.charset.Charset,%20float,%20float,%20byte[])" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetEncoder.CharsetEncoder(java.nio.charset.Charset, float, float, byte[])</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <exception cref="T:Java.Lang.IllegalArgumentException">if any parameters are invalid.
@@ -187,16 +198,17 @@
         <Parameter Name="cs" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="cs">To be added.</param>
-        <param name="c">The given character</param>
-        <summary>Tells whether or not this encoder can encode the given character.</summary>
+        <param name="cs">The given character sequence</param>
+        <summary>Tells whether or not this encoder can encode the given character
+            sequence.</summary>
         <returns>
           <c>true</c> if, and only if, this encoder can encode
-                     the given character</returns>
+                     the given character without throwing any exceptions and without
+                     performing any replacements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder#canEncode(char)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetEncoder.canEncode(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder#canEncode(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetEncoder.canEncode(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -272,16 +284,17 @@
         <Parameter Name="cs" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="cs">To be added.</param>
-        <param name="c">The given character</param>
-        <summary>Tells whether or not this encoder can encode the given character.</summary>
+        <param name="cs">The given character sequence</param>
+        <summary>Tells whether or not this encoder can encode the given character
+            sequence.</summary>
         <returns>
           <c>true</c> if, and only if, this encoder can encode
-                     the given character</returns>
+                     the given character without throwing any exceptions and without
+                     performing any replacements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder#canEncode(char)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetEncoder.canEncode(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder#canEncode(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetEncoder.canEncode(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -412,18 +425,18 @@
         <Parameter Name="endOfInput" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="out">the output buffer.</param>
-        <param name="endOfInput">true if all the input characters have been provided.</param>
         <param name="in">The input character buffer</param>
-        <summary>Convenience method that encodes the remaining content of a single input
-            character buffer into a newly-allocated byte buffer.</summary>
-        <returns>A newly-allocated byte buffer containing the result of the
-                    encoding operation.  The buffer's position will be zero and its
-                    limit will follow the last byte written.</returns>
+        <param name="out">The output byte buffer</param>
+        <param name="endOfInput">
+          <c>true</c> if, and only if, the invoker can provide no
+                    additional input characters beyond those in the given buffer</param>
+        <summary>Encodes as many characters as possible from the given input buffer,
+            writing the results to the given output buffer.</summary>
+        <returns>A coder-result object describing the reason for termination</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder#encode(java.nio.CharBuffer)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetEncoder.encode(java.nio.CharBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder#encode(java.nio.CharBuffer,%20java.nio.ByteBuffer,%20boolean)" title="Reference documentation">Java documentation for <code>java.nio.charset.CharsetEncoder.encode(java.nio.CharBuffer, java.nio.ByteBuffer, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio.Spi/FileSystemProvider.xml b/docs/Mono.Android/en/Java.Nio.FileNio.Spi/FileSystemProvider.xml
index 9b1dc01032..c09b7c8bdb 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio.Spi/FileSystemProvider.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio.Spi/FileSystemProvider.xml
@@ -444,7 +444,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="&lt;V&gt;&lt;V&gt;">The <c>FileAttributeView</c> type</param>
         <param name="path">the path to the file</param>
         <param name="type">the <c>Class</c> object corresponding to the file attribute view</param>
         <param name="options">options indicating how symbolic links are handled</param>
@@ -1062,16 +1061,16 @@
         <Parameter Name="env" Type="System.Collections.Generic.IDictionary&lt;System.String,System.Object&gt;" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="uri">URI reference</param>
+        <param name="path">The path to the file</param>
         <param name="env">A map of provider specific properties to configure the file system;
                      may be empty</param>
-        <summary>Constructs a new <c>FileSystem</c> object identified by a URI.</summary>
+        <summary>Constructs a new <c>FileSystem</c> to access the contents of a file as a
+            file system.</summary>
         <returns>A new file system</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider#newFileSystem(java.net.URI,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.nio.file.spi.FileSystemProvider.newFileSystem(java.net.URI, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider#newFileSystem(java.nio.file.Path,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.nio.file.spi.FileSystemProvider.newFileSystem(java.nio.file.Path, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -1217,7 +1216,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="&lt;A&gt;&lt;A&gt;">The <c>BasicFileAttributes</c> type</param>
         <param name="path">the path to the file</param>
         <param name="type">the <c>Class</c> of the file attributes required
                      to read</param>
@@ -1270,11 +1268,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
-        <param name="&lt;A&gt;&lt;A&gt;">The <c>BasicFileAttributes</c> type</param>
         <param name="path">the path to the file</param>
-        <param name="type">the <c>Class</c> of the file attributes required
-                     to read</param>
+        <param name="attributes">To be added.</param>
         <param name="options">options indicating how symbolic links are handled</param>
         <summary>Reads a file's attributes as a bulk operation.</summary>
         <returns>the file attributes</returns>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/AccessDeniedException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/AccessDeniedException.xml
index e9c5576a4e..fe8d3e5e1c 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/AccessDeniedException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/AccessDeniedException.xml
@@ -115,14 +115,14 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="other">To be added.</param>
-        <param name="reason">To be added.</param>
         <param name="file">a string identifying the file or <c>null</c> if not known</param>
+        <param name="other">a string identifying the other file or <c>null</c> if not known</param>
+        <param name="reason">a reason message with additional information or <c>null</c></param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/AccessDeniedException#AccessDeniedException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.AccessDeniedException.AccessDeniedException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/AccessDeniedException#AccessDeniedException(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.AccessDeniedException.AccessDeniedException(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/FileAlreadyExistsException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/FileAlreadyExistsException.xml
index 6ac3bc39e2..14b4740059 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/FileAlreadyExistsException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/FileAlreadyExistsException.xml
@@ -115,14 +115,14 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="other">To be added.</param>
-        <param name="reason">To be added.</param>
         <param name="file">a string identifying the file or <c>null</c> if not known</param>
+        <param name="other">a string identifying the other file or <c>null</c> if not known</param>
+        <param name="reason">a reason message with additional information or <c>null</c></param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/FileAlreadyExistsException#FileAlreadyExistsException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.FileAlreadyExistsException.FileAlreadyExistsException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/FileAlreadyExistsException#FileAlreadyExistsException(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.FileAlreadyExistsException.FileAlreadyExistsException(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/FileStore.xml b/docs/Mono.Android/en/Java.Nio.FileNio/FileStore.xml
index 4d3fe59a21..7635d5acb6 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/FileStore.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/FileStore.xml
@@ -336,8 +336,7 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="type">the file attribute view type</param>
+        <param name="name">the <c>FileAttributeView#name name</c> of file attribute view</param>
         <summary>Tells whether or not this file store supports the file attributes
             identified by the given file attribute view.</summary>
         <returns>
@@ -346,7 +345,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/FileStore#supportsFileAttributeView(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.nio.file.FileStore.supportsFileAttributeView(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/FileStore#supportsFileAttributeView(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.FileStore.supportsFileAttributeView(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemAlreadyExistsException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemAlreadyExistsException.xml
index 8ce13bb719..7c4be210ea 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemAlreadyExistsException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemAlreadyExistsException.xml
@@ -86,12 +86,12 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
+        <param name="msg">the detail message</param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/FileSystemAlreadyExistsException#FileSystemAlreadyExistsException()" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystemAlreadyExistsException.FileSystemAlreadyExistsException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/FileSystemAlreadyExistsException#FileSystemAlreadyExistsException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystemAlreadyExistsException.FileSystemAlreadyExistsException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemException.xml
index c2080734d7..ab191f309d 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemException.xml
@@ -114,14 +114,15 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="other">To be added.</param>
-        <param name="reason">To be added.</param>
         <param name="file">a string identifying the file or <c>null</c> if not known.</param>
+        <param name="other">a string identifying the other file or <c>null</c> if there
+                     isn't another file or if not known</param>
+        <param name="reason">a reason message with additional information or <c>null</c></param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/FileSystemException#FileSystemException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystemException.FileSystemException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/FileSystemException#FileSystemException(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystemException.FileSystemException(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemNotFoundException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemNotFoundException.xml
index 23e8db1dfa..065f8db824 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemNotFoundException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystemNotFoundException.xml
@@ -85,12 +85,12 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
+        <param name="msg">the detail message</param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/FileSystemNotFoundException#FileSystemNotFoundException()" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystemNotFoundException.FileSystemNotFoundException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/FileSystemNotFoundException#FileSystemNotFoundException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystemNotFoundException.FileSystemNotFoundException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystems.xml b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystems.xml
index 8f1441e7f2..889a6e8e96 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/FileSystems.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/FileSystems.xml
@@ -207,17 +207,16 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="path">To be added.</param>
-        <param name="loader">To be added.</param>
-        <param name="uri">the URI identifying the file system</param>
-        <param name="env">a map of provider specific properties to configure the file system;
-                     may be empty</param>
-        <summary>Constructs a new file system that is identified by a <c>URI</c></summary>
+        <param name="path">the path to the file</param>
+        <param name="loader">the class loader to locate the provider or <c>null</c> to only
+                     attempt to locate an installed provider</param>
+        <summary>Constructs a new <c>FileSystem</c> to access the contents of a file as a
+            file system.</summary>
         <returns>a new file system</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/FileSystems#newFileSystem(java.net.URI,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystems.newFileSystem(java.net.URI, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/FileSystems#newFileSystem(java.nio.file.Path,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystems.newFileSystem(java.nio.file.Path, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -253,16 +252,17 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="loader">To be added.</param>
         <param name="uri">the URI identifying the file system</param>
         <param name="env">a map of provider specific properties to configure the file system;
                      may be empty</param>
+        <param name="loader">the class loader to locate the provider or <c>null</c> to only
+                     attempt to locate an installed provider</param>
         <summary>Constructs a new file system that is identified by a <c>URI</c></summary>
         <returns>a new file system</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/FileSystems#newFileSystem(java.net.URI,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystems.newFileSystem(java.net.URI, java.util.Map)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/FileSystems#newFileSystem(java.net.URI,%20java.util.Map,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.nio.file.FileSystems.newFileSystem(java.net.URI, java.util.Map, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/Files.xml b/docs/Mono.Android/en/Java.Nio.FileNio/Files.xml
index cd8cce9041..2d40bd14ed 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/Files.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/Files.xml
@@ -58,14 +58,14 @@
         <Parameter Name="out" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="source">To be added.</param>
-        <param name="out">To be added.</param>
-        <summary>Reads all bytes from an input stream and writes them to an output stream.</summary>
-        <returns>To be added.</returns>
+        <param name="source">the  path to the file</param>
+        <param name="out">the output stream to write to</param>
+        <summary>Copies all bytes from a file to an output stream.</summary>
+        <returns>the number of bytes read or written</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Files#copy(java.io.InputStream,%20java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.copy(java.io.InputStream, java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Files#copy(java.nio.file.Path,%20java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.copy(java.nio.file.Path, java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -865,7 +865,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="&lt;V&gt;&lt;V&gt;">The <c>FileAttributeView</c> type</param>
         <param name="path">the path to the file</param>
         <param name="type">the <c>Class</c> object corresponding to the file attribute view</param>
         <param name="options">options indicating how symbolic links are handled</param>
@@ -1589,16 +1588,16 @@
         <Parameter Name="cs" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="cs">To be added.</param>
         <param name="path">the path to the file</param>
-        <summary>Opens a file for reading, returning a <c>BufferedReader</c> to read text
-            from the file in an efficient manner.</summary>
+        <param name="cs">the charset to use for decoding</param>
+        <summary>Opens a file for reading, returning a <c>BufferedReader</c> that may be
+            used to read text from the file in an efficient manner.</summary>
         <returns>a new buffered reader, with default buffer size, to read text
                      from the file</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Files#newBufferedReader(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.newBufferedReader(java.nio.file.Path)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Files#newBufferedReader(java.nio.file.Path,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.newBufferedReader(java.nio.file.Path, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -1641,7 +1640,6 @@
       </Parameters>
       <Docs>
         <param name="path">the path to the file</param>
-        <param name="cs">the charset to use for encoding</param>
         <param name="options">options specifying how the file is opened</param>
         <summary>Opens or creates a file for writing, returning a <c>BufferedWriter</c>
             that may be used to write text to the file in an efficient manner.</summary>
@@ -1796,9 +1794,9 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="attrs">To be added.</param>
         <param name="path">the path to the file to open or create</param>
         <param name="options">options specifying how the file is opened</param>
+        <param name="attrs">To be added.</param>
         <summary>Opens or creates a file, returning a seekable byte channel to access the
             file.</summary>
         <returns>a new seekable byte channel</returns>
@@ -1881,8 +1879,8 @@
         <Parameter Name="filter" Type="Java.Nio.FileNio.IDirectoryStreamFilter" />
       </Parameters>
       <Docs>
-        <param name="filter">To be added.</param>
         <param name="dir">the path to the directory</param>
+        <param name="filter">To be added.</param>
         <summary>Opens a directory, returning a <c>DirectoryStream</c> to iterate over
             all entries in the directory.</summary>
         <returns>a new and open <c>DirectoryStream</c> object</returns>
@@ -1924,15 +1922,15 @@
         <Parameter Name="glob" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="glob">To be added.</param>
         <param name="dir">the path to the directory</param>
+        <param name="glob">the glob pattern</param>
         <summary>Opens a directory, returning a <c>DirectoryStream</c> to iterate over
-            all entries in the directory.</summary>
+            the entries in the directory.</summary>
         <returns>a new and open <c>DirectoryStream</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Files#newDirectoryStream(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.newDirectoryStream(java.nio.file.Path)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Files#newDirectoryStream(java.nio.file.Path,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.newDirectoryStream(java.nio.file.Path, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2239,15 +2237,15 @@
         <Parameter Name="cs" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="cs">To be added.</param>
         <param name="path">the path to the file</param>
+        <param name="cs">the charset to use for decoding</param>
         <summary>Read all lines from a file.</summary>
         <returns>the lines from the file as a <c>List</c>; whether the <c>List</c> is modifiable or not is implementation dependent and
                      therefore not specified</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Files#readAllLines(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.readAllLines(java.nio.file.Path)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Files#readAllLines(java.nio.file.Path,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.readAllLines(java.nio.file.Path, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -2294,7 +2292,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="&lt;A&gt;&lt;A&gt;">The <c>BasicFileAttributes</c> type</param>
         <param name="path">the path to the file</param>
         <param name="type">the <c>Class</c> of the file attributes required
                      to read</param>
@@ -2347,11 +2344,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
-        <param name="&lt;A&gt;&lt;A&gt;">The <c>BasicFileAttributes</c> type</param>
         <param name="path">the path to the file</param>
-        <param name="type">the <c>Class</c> of the file attributes required
-                     to read</param>
+        <param name="attributes">To be added.</param>
         <param name="options">options indicating how symbolic links are handled</param>
         <summary>Reads a file's attributes as a bulk operation.</summary>
         <returns>the file attributes</returns>
@@ -2758,16 +2752,16 @@
         <Parameter Name="visitor" Type="Java.Nio.FileNio.IFileVisitor" />
       </Parameters>
       <Docs>
-        <param name="options">To be added.</param>
-        <param name="maxDepth">To be added.</param>
         <param name="start">the starting file</param>
+        <param name="options">options to configure the traversal</param>
+        <param name="maxDepth">the maximum number of directory levels to visit</param>
         <param name="visitor">the file visitor to invoke for each file</param>
         <summary>Walks a file tree.</summary>
         <returns>the starting file</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Files#walkFileTree(java.nio.file.Path,%20java.nio.file.FileVisitor)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.walkFileTree(java.nio.file.Path, java.nio.file.FileVisitor)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Files#walkFileTree(java.nio.file.Path,%20java.util.Set,%20int,%20java.nio.file.FileVisitor)" title="Reference documentation">Java documentation for <code>java.nio.file.Files.walkFileTree(java.nio.file.Path, java.util.Set, int, java.nio.file.FileVisitor)</code>.</a>
             </format>
           </para>
           <para>
@@ -2812,7 +2806,6 @@
       <Docs>
         <param name="path">the path to the file</param>
         <param name="lines">an object to iterate over the char sequences</param>
-        <param name="cs">the charset to use for encoding</param>
         <param name="options">options specifying how the file is opened</param>
         <summary>Write lines of text to a file.</summary>
         <returns>the path</returns>
@@ -2862,10 +2855,8 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
         <param name="path">the path to the file</param>
-        <param name="lines">an object to iterate over the char sequences</param>
-        <param name="cs">the charset to use for encoding</param>
+        <param name="bytes">To be added.</param>
         <param name="options">options specifying how the file is opened</param>
         <summary>Write lines of text to a file.</summary>
         <returns>the path</returns>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/IPath.xml b/docs/Mono.Android/en/Java.Nio.FileNio/IPath.xml
index 91b72a001f..fca65b0422 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/IPath.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/IPath.xml
@@ -115,16 +115,15 @@
         <Parameter Name="other" Type="Java.Nio.FileNio.IPath" />
       </Parameters>
       <Docs>
-        <param name="other">the given path string</param>
-        <summary>Tests if this path ends with a <c>Path</c>, constructed by converting
-            the given path string, in exactly the manner specified by the <c>#endsWith(Path) endsWith(Path)</c> method.</summary>
+        <param name="other">the given path</param>
+        <summary>Tests if this path ends with the given path.</summary>
         <returns>
           <c>true</c> if this path ends with the given path; otherwise
                      <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Path#endsWith(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.endsWith(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Path#endsWith(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.endsWith(java.nio.file.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -599,9 +598,9 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="modifiers">To be added.</param>
         <param name="watcher">The watch service to which this object is to be registered</param>
         <param name="events">The events for which this object should be registered</param>
+        <param name="modifiers">To be added.</param>
         <summary>Registers the file located by this path with a watch service.</summary>
         <returns>A key representing the registration of this object with the
                      given watch service</returns>
@@ -683,14 +682,13 @@
         <Parameter Name="other" Type="Java.Nio.FileNio.IPath" />
       </Parameters>
       <Docs>
-        <param name="other">the path string to resolve against this path</param>
-        <summary>Converts a given path string to a <c>Path</c> and resolves it against
-            this <c>Path</c> in exactly the manner specified by the <c>#resolve(Path) resolve</c> method.</summary>
+        <param name="other">the path to resolve against this path</param>
+        <summary>Resolve the given path against this path.</summary>
         <returns>the resulting path</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Path#resolve(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.resolve(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Path#resolve(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.resolve(java.nio.file.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -765,15 +763,14 @@
         <Parameter Name="other" Type="Java.Nio.FileNio.IPath" />
       </Parameters>
       <Docs>
-        <param name="other">the path string to resolve against this path's parent</param>
-        <summary>Converts a given path string to a <c>Path</c> and resolves it against
-            this path's <c>#getParent parent</c> path in exactly the manner
-            specified by the <c>#resolveSibling(Path) resolveSibling</c> method.</summary>
+        <param name="other">the path to resolve against this path's parent</param>
+        <summary>Resolves the given path against this path's <c>#getParent parent</c>
+            path.</summary>
         <returns>the resulting path</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Path#resolveSibling(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.resolveSibling(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Path#resolveSibling(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.resolveSibling(java.nio.file.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -876,16 +873,15 @@
         <Parameter Name="other" Type="Java.Nio.FileNio.IPath" />
       </Parameters>
       <Docs>
-        <param name="other">the given path string</param>
-        <summary>Tests if this path starts with a <c>Path</c>, constructed by converting
-            the given path string, in exactly the manner specified by the <c>#startsWith(Path) startsWith(Path)</c> method.</summary>
+        <param name="other">the given path</param>
+        <summary>Tests if this path starts with the given path.</summary>
         <returns>
           <c>true</c> if this path starts with the given path; otherwise
                      <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Path#startsWith(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.startsWith(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Path#startsWith(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.nio.file.Path.startsWith(java.nio.file.Path)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/ISecureDirectoryStream.xml b/docs/Mono.Android/en/Java.Nio.FileNio/ISecureDirectoryStream.xml
index 1973836f5b..2cb96b75d3 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/ISecureDirectoryStream.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/ISecureDirectoryStream.xml
@@ -217,9 +217,8 @@
       </Parameters>
       <Docs>
         <param name="path">To be added.</param>
-        <param name="options">To be added.</param>
-        <param name="&lt;V&gt;&lt;V&gt;">The <c>FileAttributeView</c> type</param>
         <param name="type">the <c>Class</c> object corresponding to the file attribute view</param>
+        <param name="options">To be added.</param>
         <summary>Returns a new file attribute view to access the file attributes of this
             directory.</summary>
         <returns>a new file attribute view of the specified type bound to
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/IWatchService.xml b/docs/Mono.Android/en/Java.Nio.FileNio/IWatchService.xml
index d36b5494a9..d8f9267019 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/IWatchService.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/IWatchService.xml
@@ -145,15 +145,16 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
-        <summary>Retrieves and removes the next watch key, or <c>null</c> if none are
-            present.</summary>
+        <param name="timeout">how to wait before giving up, in units of unit</param>
+        <param name="unit">a <c>TimeUnit</c> determining how to interpret the timeout
+                     parameter</param>
+        <summary>Retrieves and removes the next watch key, waiting if necessary up to the
+            specified wait time if none are yet present.</summary>
         <returns>the next watch key, or <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/WatchService#poll()" title="Reference documentation">Java documentation for <code>java.nio.file.WatchService.poll()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/WatchService#poll(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.nio.file.WatchService.poll(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/IWatchable.xml b/docs/Mono.Android/en/Java.Nio.FileNio/IWatchable.xml
index 3f95d7f011..552271ff80 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/IWatchable.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/IWatchable.xml
@@ -123,9 +123,9 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="modifiers">To be added.</param>
         <param name="watcher">the watch service to which this object is to be registered</param>
         <param name="events">the events for which this object should be registered</param>
+        <param name="modifiers">To be added.</param>
         <summary>Registers an object with a watch service.</summary>
         <returns>a key representing the registration of this object with the
                      given watch service</returns>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/InvalidPathException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/InvalidPathException.xml
index 39f70f9df7..0d75645cfe 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/InvalidPathException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/InvalidPathException.xml
@@ -118,14 +118,16 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
         <param name="input">the input string</param>
         <param name="reason">a string explaining why the input was rejected</param>
-        <summary>Constructs an instance from the given input string and reason.</summary>
+        <param name="index">the index at which the error occurred,
+                            or <c>-1</c> if the index is not known</param>
+        <summary>Constructs an instance from the given input string, reason, and error
+            index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/InvalidPathException#InvalidPathException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.InvalidPathException.InvalidPathException(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/InvalidPathException#InvalidPathException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.nio.file.InvalidPathException.InvalidPathException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/LinkPermission.xml b/docs/Mono.Android/en/Java.Nio.FileNio/LinkPermission.xml
index f5c685aa31..8ded7db46e 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/LinkPermission.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/LinkPermission.xml
@@ -90,13 +90,14 @@
         <Parameter Name="actions" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="actions">To be added.</param>
-        <param name="name">the name of the permission. It must be "hard" or "symbolic".</param>
+        <param name="name">the name of the permission; must be "hard" or "symbolic".</param>
+        <param name="actions">the actions for the permission; must be the empty string or
+                     <c>null</c></param>
         <summary>Constructs a <c>LinkPermission</c> with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/LinkPermission#LinkPermission(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.LinkPermission.LinkPermission(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/LinkPermission#LinkPermission(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.LinkPermission.LinkPermission(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/NoSuchFileException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/NoSuchFileException.xml
index c73744f51a..2b57d54f9d 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/NoSuchFileException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/NoSuchFileException.xml
@@ -115,14 +115,14 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="other">To be added.</param>
-        <param name="reason">To be added.</param>
         <param name="file">a string identifying the file or <c>null</c> if not known.</param>
+        <param name="other">a string identifying the other file or <c>null</c> if not known.</param>
+        <param name="reason">a reason message with additional information or <c>null</c></param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/NoSuchFileException#NoSuchFileException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.NoSuchFileException.NoSuchFileException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/NoSuchFileException#NoSuchFileException(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.NoSuchFileException.NoSuchFileException(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/NotLinkException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/NotLinkException.xml
index 6e69c25cb7..261dc0036c 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/NotLinkException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/NotLinkException.xml
@@ -115,14 +115,14 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="other">To be added.</param>
-        <param name="reason">To be added.</param>
         <param name="file">a string identifying the file or <c>null</c> if not known</param>
+        <param name="other">a string identifying the other file or <c>null</c> if not known</param>
+        <param name="reason">a reason message with additional information or <c>null</c></param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/NotLinkException#NotLinkException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.NotLinkException.NotLinkException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/NotLinkException#NotLinkException(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.NotLinkException.NotLinkException(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/Paths.xml b/docs/Mono.Android/en/Java.Nio.FileNio/Paths.xml
index fd7fecac27..eec0b46ef3 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/Paths.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/Paths.xml
@@ -57,16 +57,13 @@
         <Parameter Name="uri" Type="Java.Net.URI" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="first">the path string or initial part of the path string</param>
-        <param name="more">additional strings to be joined to form the path string</param>
-        <summary>Converts a path string, or a sequence of strings that when joined form
-            a path string, to a <c>Path</c>.</summary>
+        <param name="uri">the URI to convert</param>
+        <summary>Converts the given URI to a <c>Path</c> object.</summary>
         <returns>the resulting <c>Path</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/Paths#get(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.Paths.get(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/Paths#get(java.net.URI)" title="Reference documentation">Java documentation for <code>java.nio.file.Paths.get(java.net.URI)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/ProviderMismatchException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/ProviderMismatchException.xml
index 056e6b298f..97d17e9a54 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/ProviderMismatchException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/ProviderMismatchException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
+        <param name="msg">the detail message</param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/ProviderMismatchException#ProviderMismatchException()" title="Reference documentation">Java documentation for <code>java.nio.file.ProviderMismatchException.ProviderMismatchException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/ProviderMismatchException#ProviderMismatchException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.ProviderMismatchException.ProviderMismatchException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio.FileNio/ProviderNotFoundException.xml b/docs/Mono.Android/en/Java.Nio.FileNio/ProviderNotFoundException.xml
index b464c2c43c..6f8b383254 100644
--- a/docs/Mono.Android/en/Java.Nio.FileNio/ProviderNotFoundException.xml
+++ b/docs/Mono.Android/en/Java.Nio.FileNio/ProviderNotFoundException.xml
@@ -85,12 +85,12 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
+        <param name="msg">the detail message</param>
         <summary>Constructs an instance of this class.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/file/ProviderNotFoundException#ProviderNotFoundException()" title="Reference documentation">Java documentation for <code>java.nio.file.ProviderNotFoundException.ProviderNotFoundException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/file/ProviderNotFoundException#ProviderNotFoundException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.file.ProviderNotFoundException.ProviderNotFoundException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/Buffer.xml b/docs/Mono.Android/en/Java.Nio/Buffer.xml
index d1dab752b4..78dc3d310d 100644
--- a/docs/Mono.Android/en/Java.Nio/Buffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/Buffer.xml
@@ -451,14 +451,14 @@
         <Parameter Name="newLimit" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="newLimit">the new limit, must not be negative and not greater than
-            capacity.</param>
-        <summary>Returns this buffer's limit.</summary>
-        <returns>The limit of this buffer</returns>
+        <param name="newLimit">The new limit value; must be non-negative
+                    and no larger than this buffer's capacity</param>
+        <summary>Sets this buffer's limit.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/Buffer#limit()" title="Reference documentation">Java documentation for <code>java.nio.Buffer.limit()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/Buffer#limit(int)" title="Reference documentation">Java documentation for <code>java.nio.Buffer.limit(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -571,14 +571,14 @@
         <Parameter Name="newPosition" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="newPosition">the new position, must be not negative and not greater than
-            limit.</param>
-        <summary>Returns this buffer's position.</summary>
-        <returns>The position of this buffer</returns>
+        <param name="newPosition">The new position value; must be non-negative
+                    and no larger than the current limit</param>
+        <summary>Sets this buffer's position.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/Buffer#position()" title="Reference documentation">Java documentation for <code>java.nio.Buffer.position()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/Buffer#position(int)" title="Reference documentation">Java documentation for <code>java.nio.Buffer.position(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/ByteBuffer.xml b/docs/Mono.Android/en/Java.Nio/ByteBuffer.xml
index fa78c40464..86cdf27a50 100644
--- a/docs/Mono.Android/en/Java.Nio/ByteBuffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/ByteBuffer.xml
@@ -743,13 +743,13 @@
         <Parameter Name="dst" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination byte array.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The byte at the buffer's current position</returns>
+        <param name="dst">The destination array</param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#get(byte[])" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.get(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -786,13 +786,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than limit.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The byte at the buffer's current position</returns>
+        <param name="index">The index from which the byte will be read</param>
+        <summary>Absolute <i>get</i> method.</summary>
+        <returns>The byte at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#get(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.get(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -831,15 +831,19 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the target byte array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The byte at the buffer's current position</returns>
+        <param name="dst">The array into which bytes are to be written</param>
+        <param name="offset">The offset within the array of the first byte to be
+                    written; must be non-negative and no larger than
+                    <c>dst.length</c></param>
+        <param name="length">The maximum number of bytes to be written to the given
+                    array; must be non-negative and no larger than
+                    <c>dst.length - offset</c></param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#get(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.get(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -876,14 +880,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 2</c>.</param>
-        <summary>Relative <i>get</i> method for reading a char value.</summary>
-        <returns>The char value at the buffer's current position</returns>
+        <param name="index">The index from which the bytes will be read</param>
+        <summary>Absolute <i>get</i> method for reading a char value.</summary>
+        <returns>The char value at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getChar()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getChar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getChar(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getChar(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -920,14 +923,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 8</c>.</param>
-        <summary>Relative <i>get</i> method for reading a double value.</summary>
-        <returns>The double value at the buffer's current position</returns>
+        <param name="index">The index from which the bytes will be read</param>
+        <summary>Absolute <i>get</i> method for reading a double value.</summary>
+        <returns>The double value at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getDouble()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getDouble()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getDouble(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getDouble(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -964,14 +966,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 4</c>.</param>
-        <summary>Relative <i>get</i> method for reading a float value.</summary>
-        <returns>The float value at the buffer's current position</returns>
+        <param name="index">The index from which the bytes will be read</param>
+        <summary>Absolute <i>get</i> method for reading a float value.</summary>
+        <returns>The float value at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getFloat()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getFloat()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getFloat(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getFloat(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1008,14 +1009,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 4</c>.</param>
-        <summary>Relative <i>get</i> method for reading an int value.</summary>
-        <returns>The int value at the buffer's current position</returns>
+        <param name="index">The index from which the bytes will be read</param>
+        <summary>Absolute <i>get</i> method for reading an int value.</summary>
+        <returns>The int value at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getInt()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getInt()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getInt(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getInt(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1052,14 +1052,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 8</c>.</param>
-        <summary>Relative <i>get</i> method for reading a long value.</summary>
-        <returns>The long value at the buffer's current position</returns>
+        <param name="index">The index from which the bytes will be read</param>
+        <summary>Absolute <i>get</i> method for reading a long value.</summary>
+        <returns>The long value at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getLong()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getLong(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getLong(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1096,14 +1095,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 2</c>.</param>
-        <summary>Relative <i>get</i> method for reading a short value.</summary>
-        <returns>The short value at the buffer's current position</returns>
+        <param name="index">The index from which the bytes will be read</param>
+        <summary>Absolute <i>get</i> method for reading a short value.</summary>
+        <returns>The short value at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getShort()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getShort()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#getShort(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.getShort(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1340,13 +1338,15 @@
         <Parameter Name="bo" Type="Java.Nio.ByteOrder" />
       </Parameters>
       <Docs>
-        <param name="bo">To be added.</param>
-        <summary>Retrieves this buffer's byte order.</summary>
-        <returns>This buffer's byte order</returns>
+        <param name="bo">The new byte order,
+                    either <c>ByteOrder#BIG_ENDIAN BIG_ENDIAN</c>
+                    or <c>ByteOrder#LITTLE_ENDIAN LITTLE_ENDIAN</c></param>
+        <summary>Modifies this buffer's byte order.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#order()" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.order()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#order(java.nio.ByteOrder)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.order(java.nio.ByteOrder)</code>.</a>
             </format>
           </para>
           <para>
@@ -1382,14 +1382,14 @@
         <Parameter Name="src" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">the source byte buffer.</param>
-        <param name="b">The byte to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source buffer from which bytes are to be read;
+                    must not be this buffer</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(byte)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1429,14 +1429,13 @@
         <Parameter Name="src" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="src">the source byte array.</param>
-        <param name="b">The byte to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source array</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(byte)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(byte[])" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1519,14 +1518,14 @@
         <Parameter Name="b" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than the limit.</param>
-        <param name="b">The byte to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="index">The index at which the byte will be written</param>
+        <param name="b">The byte value to be written</param>
+        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(byte)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(int,%20byte)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(int, byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -1566,16 +1565,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">the source byte array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="b">The byte to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The array from which bytes are to be read</param>
+        <param name="offset">The offset within the array of the first byte to be read;
+                    must be non-negative and no larger than <c>array.length</c></param>
+        <param name="length">The number of bytes to be read from the given array;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(byte)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#put(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.put(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1660,16 +1661,15 @@
         <Parameter Name="value" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 2</c>.</param>
+        <param name="index">The index at which the bytes will be written</param>
         <param name="value">The char value to be written</param>
-        <summary>Relative <i>put</i> method for writing a char
+        <summary>Absolute <i>put</i> method for writing a char
             value&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putChar(char)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putChar(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putChar(int,%20char)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putChar(int, char)</code>.</a>
             </format>
           </para>
           <para>
@@ -1753,16 +1753,15 @@
         <Parameter Name="value" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 8</c>.</param>
+        <param name="index">The index at which the bytes will be written</param>
         <param name="value">The double value to be written</param>
-        <summary>Relative <i>put</i> method for writing a double
+        <summary>Absolute <i>put</i> method for writing a double
             value&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putDouble(double)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putDouble(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putDouble(int,%20double)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putDouble(int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1846,16 +1845,15 @@
         <Parameter Name="value" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 4</c>.</param>
+        <param name="index">The index at which the bytes will be written</param>
         <param name="value">The float value to be written</param>
-        <summary>Relative <i>put</i> method for writing a float
+        <summary>Absolute <i>put</i> method for writing a float
             value&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putFloat(float)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putFloat(float)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putFloat(int,%20float)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putFloat(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1939,16 +1937,15 @@
         <Parameter Name="value" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and equal or less than
-            <c>limit - 4</c>.</param>
+        <param name="index">The index at which the bytes will be written</param>
         <param name="value">The int value to be written</param>
-        <summary>Relative <i>put</i> method for writing an int
+        <summary>Absolute <i>put</i> method for writing an int
             value&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putInt(int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putInt(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putInt(int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putInt(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1986,15 +1983,14 @@
         <Parameter Name="value" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="index">The index at which the bytes will be written</param>
         <param name="value">The long value to be written</param>
-        <summary>Absolute <i>put</i> method for writing a long
+        <summary>Relative <i>put</i> method for writing a long
             value&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putLong(int,%20long)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putLong(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putLong(long)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putLong(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2079,15 +2075,14 @@
         <Parameter Name="value" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="index">The index at which the bytes will be written</param>
         <param name="value">The short value to be written</param>
-        <summary>Absolute <i>put</i> method for writing a short
+        <summary>Relative <i>put</i> method for writing a short
             value&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putShort(int,%20short)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putShort(int, short)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#putShort(short)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.putShort(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -2346,15 +2341,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="array">The array that will back this buffer</param>
+        <param name="array">The array that will back the new buffer</param>
+        <param name="offset">The offset of the subarray to be used; must be non-negative and
+                    no larger than <c>array.length</c>.  The new buffer's position
+                    will be set to this value.</param>
+        <param name="length">The length of the subarray to be used;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c>.
+                    The new buffer's limit will be set to <c>offset + length</c>.</param>
         <summary>Wraps a byte array into a buffer.</summary>
         <returns>The new byte buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#wrap(byte[])" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.wrap(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ByteBuffer#wrap(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.ByteBuffer.wrap(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/CharBuffer.xml b/docs/Mono.Android/en/Java.Nio/CharBuffer.xml
index 372ee2bd6f..0e562310c4 100644
--- a/docs/Mono.Android/en/Java.Nio/CharBuffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/CharBuffer.xml
@@ -151,15 +151,16 @@
         <Parameter Name="csq" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="csq">the <c>CharSequence</c> to write.</param>
-        <param name="c">The 16-bit char to append</param>
-        <summary>Appends the specified char  to this
+        <param name="csq">The character sequence to append.  If <c>csq</c> is
+                    <c>null</c>, then the four characters <c>"null"</c> are
+                    appended to this character buffer.</param>
+        <summary>Appends the specified character sequence  to this
             buffer&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -236,15 +237,16 @@
         <Parameter Name="csq" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="csq">To be added.</param>
-        <param name="c">The 16-bit char to append</param>
-        <summary>Appends the specified char  to this
+        <param name="csq">The character sequence to append.  If <c>csq</c> is
+                    <c>null</c>, then the four characters <c>"null"</c> are
+                    appended to this character buffer.</param>
+        <summary>Appends the specified character sequence  to this
             buffer&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -280,19 +282,21 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="csq">the <c>CharSequence</c> to write.</param>
         <param name="start">the first char to write, must not be negative and not greater
             than <c>csq.length()</c>.</param>
         <param name="end">the last char to write (excluding), must be less than
             <c>start</c> and not greater than <c>csq.length()</c>.</param>
-        <param name="c">The 16-bit char to append</param>
-        <summary>Appends the specified char  to this
+        <param name="csq">The character sequence from which a subsequence will be
+                    appended.  If <c>csq</c> is <c>null</c>, then characters
+                    will be appended as if <c>csq</c> contained the four
+                    characters <c>"null"</c>.</param>
+        <summary>Appends a subsequence of the  specified character sequence  to this
             buffer&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -327,17 +331,19 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="csq">To be added.</param>
         <param name="start">To be added.</param>
         <param name="end">To be added.</param>
-        <param name="c">The 16-bit char to append</param>
-        <summary>Appends the specified char  to this
+        <param name="csq">The character sequence from which a subsequence will be
+                    appended.  If <c>csq</c> is <c>null</c>, then characters
+                    will be appended as if <c>csq</c> contained the four
+                    characters <c>"null"</c>.</param>
+        <summary>Appends a subsequence of the  specified character sequence  to this
             buffer&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#append(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.append(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -661,13 +667,13 @@
         <Parameter Name="dst" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination char array.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The char at the buffer's current position</returns>
+        <param name="dst">The destination array</param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#get(char[])" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.get(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -704,13 +710,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than limit.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The char at the buffer's current position</returns>
+        <param name="index">The index from which the char will be read</param>
+        <summary>Absolute <i>get</i> method.</summary>
+        <returns>The char at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#get(int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.get(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -749,15 +755,19 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the target char array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The char at the buffer's current position</returns>
+        <param name="dst">The array into which chars are to be written</param>
+        <param name="offset">The offset within the array of the first char to be
+                    written; must be non-negative and no larger than
+                    <c>dst.length</c></param>
+        <param name="length">The maximum number of chars to be written to the given
+                    array; must be non-negative and no larger than
+                    <c>dst.length - offset</c></param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#get(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.get(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1095,14 +1105,14 @@
         <Parameter Name="src" Type="Java.Nio.CharBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">the source char buffer.</param>
-        <param name="c">The char to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source buffer from which chars are to be read;
+                    must not be this buffer</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(java.nio.CharBuffer)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(java.nio.CharBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1186,14 +1196,13 @@
         <Parameter Name="src" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="src">the source char array.</param>
-        <param name="c">The char to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source array</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char[])" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1231,14 +1240,13 @@
         <Parameter Name="src" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="c">The char to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source string</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(java.lang.String)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1277,14 +1285,14 @@
         <Parameter Name="c" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must be no less than zero and less than the limit.</param>
-        <param name="c">The char to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="index">The index at which the char will be written</param>
+        <param name="c">The char value to be written</param>
+        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(int,%20char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(int, char)</code>.</a>
             </format>
           </para>
           <para>
@@ -1324,16 +1332,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">the source char array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="c">The char to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The array from which chars are to be read</param>
+        <param name="offset">The offset within the array of the first char to be read;
+                    must be non-negative and no larger than <c>array.length</c></param>
+        <param name="length">The number of chars to be read from the given array;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1374,18 +1384,19 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">To be added.</param>
-        <param name="start">the first char to write, must not be negative and not greater
-            than <c>str.length()</c>.</param>
-        <param name="end">the last char to write (excluding), must be less than
-            <c>start</c> and not greater than <c>str.length()</c>.</param>
-        <param name="c">The char to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The string from which chars are to be read</param>
+        <param name="start">The offset within the string of the first char to be read;
+                    must be non-negative and no larger than
+                    <c>string.length()</c></param>
+        <param name="end">The offset within the string of the last char to be read,
+                    plus one; must be non-negative and no larger than
+                    <c>string.length()</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(char)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#put(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.put(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1736,15 +1747,13 @@
         <Parameter Name="array" Type="System.Char[]" />
       </Parameters>
       <Docs>
-        <param name="array">the char array which the new buffer will be based on.</param>
-        <param name="csq">The character sequence from which the new character buffer is to
-                    be created</param>
-        <summary>Wraps a character sequence into a buffer.</summary>
-        <returns>The new character buffer</returns>
+        <param name="array">The array that will back this buffer</param>
+        <summary>Wraps a char array into a buffer.</summary>
+        <returns>The new char buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(char[])" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1816,18 +1825,21 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="start">the start index, must not be negative and not greater than
-            <c>cs.length()</c>.</param>
-        <param name="end">the end index, must be no less than <c>start</c> and no
-            greater than <c>cs.length()</c>.</param>
         <param name="csq">The character sequence from which the new character buffer is to
                     be created</param>
+        <param name="start">The index of the first character to be used;
+                    must be non-negative and no larger than <c>csq.length()</c>.
+                    The new buffer's position will be set to this value.</param>
+        <param name="end">The index of the character following the last character to be
+                    used; must be no smaller than <c>start</c> and no larger
+                    than <c>csq.length()</c>.
+                    The new buffer's limit will be set to this value.</param>
         <summary>Wraps a character sequence into a buffer.</summary>
         <returns>The new character buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1866,17 +1878,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="array">the char array which the new buffer will be based on.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="csq">The character sequence from which the new character buffer is to
-                    be created</param>
-        <summary>Wraps a character sequence into a buffer.</summary>
-        <returns>The new character buffer</returns>
+        <param name="array">The array that will back the new buffer</param>
+        <param name="offset">The offset of the subarray to be used; must be non-negative and
+                    no larger than <c>array.length</c>.  The new buffer's position
+                    will be set to this value.</param>
+        <param name="length">The length of the subarray to be used;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c>.
+                    The new buffer's limit will be set to <c>offset + length</c>.</param>
+        <summary>Wraps a char array into a buffer.</summary>
+        <returns>The new char buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1909,16 +1924,21 @@
         <Parameter Name="end" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="start">To be added.</param>
-        <param name="end">To be added.</param>
         <param name="csq">The character sequence from which the new character buffer is to
                     be created</param>
+        <param name="start">The index of the first character to be used;
+                    must be non-negative and no larger than <c>csq.length()</c>.
+                    The new buffer's position will be set to this value.</param>
+        <param name="end">The index of the character following the last character to be
+                    used; must be no smaller than <c>start</c> and no larger
+                    than <c>csq.length()</c>.
+                    The new buffer's limit will be set to this value.</param>
         <summary>Wraps a character sequence into a buffer.</summary>
         <returns>The new character buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/CharBuffer#wrap(java.lang.CharSequence,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.CharBuffer.wrap(java.lang.CharSequence, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/DoubleBuffer.xml b/docs/Mono.Android/en/Java.Nio/DoubleBuffer.xml
index 4502132200..2e3620e70f 100644
--- a/docs/Mono.Android/en/Java.Nio/DoubleBuffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/DoubleBuffer.xml
@@ -377,13 +377,13 @@
         <Parameter Name="dst" Type="System.Double[]" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination double array.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The double at the buffer's current position</returns>
+        <param name="dst">The destination array</param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#get(double[])" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.get(double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -420,13 +420,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than limit.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The double at the buffer's current position</returns>
+        <param name="index">The index from which the double will be read</param>
+        <summary>Absolute <i>get</i> method.</summary>
+        <returns>The double at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#get(int)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.get(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -465,15 +465,19 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the target double array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The double at the buffer's current position</returns>
+        <param name="dst">The array into which doubles are to be written</param>
+        <param name="offset">The offset within the array of the first double to be
+                    written; must be non-negative and no larger than
+                    <c>dst.length</c></param>
+        <param name="length">The maximum number of doubles to be written to the given
+                    array; must be non-negative and no larger than
+                    <c>dst.length - offset</c></param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#get(double[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.get(double[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -651,14 +655,14 @@
         <Parameter Name="src" Type="Java.Nio.DoubleBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">the source double buffer.</param>
-        <param name="d">The double to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source buffer from which doubles are to be read;
+                    must not be this buffer</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(double)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(java.nio.DoubleBuffer)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(java.nio.DoubleBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -742,14 +746,13 @@
         <Parameter Name="src" Type="System.Double[]" />
       </Parameters>
       <Docs>
-        <param name="src">the source double array.</param>
-        <param name="d">The double to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source array</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(double)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(double[])" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -788,14 +791,14 @@
         <Parameter Name="d" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than the limit.</param>
-        <param name="d">The double to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="index">The index at which the double will be written</param>
+        <param name="d">The double value to be written</param>
+        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(double)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(int,%20double)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -835,16 +838,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">the source double array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="d">The double to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The array from which doubles are to be read</param>
+        <param name="offset">The offset within the array of the first double to be read;
+                    must be non-negative and no larger than <c>array.length</c></param>
+        <param name="length">The number of doubles to be read from the given array;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(double)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#put(double[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.put(double[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1027,15 +1032,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="array">The array that will back this buffer</param>
+        <param name="array">The array that will back the new buffer</param>
+        <param name="offset">The offset of the subarray to be used; must be non-negative and
+                    no larger than <c>array.length</c>.  The new buffer's position
+                    will be set to this value.</param>
+        <param name="length">The length of the subarray to be used;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c>.
+                    The new buffer's limit will be set to <c>offset + length</c>.</param>
         <summary>Wraps a double array into a buffer.</summary>
         <returns>The new double buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#wrap(double[])" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.wrap(double[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/DoubleBuffer#wrap(double[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.DoubleBuffer.wrap(double[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/FloatBuffer.xml b/docs/Mono.Android/en/Java.Nio/FloatBuffer.xml
index c0a0e84703..5a73f0332d 100644
--- a/docs/Mono.Android/en/Java.Nio/FloatBuffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/FloatBuffer.xml
@@ -377,13 +377,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than limit.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The float at the buffer's current position</returns>
+        <param name="index">The index from which the float will be read</param>
+        <summary>Absolute <i>get</i> method.</summary>
+        <returns>The float at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#get(int)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.get(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -420,13 +420,13 @@
         <Parameter Name="dst" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination float array.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The float at the buffer's current position</returns>
+        <param name="dst">The destination array</param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#get(float[])" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.get(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -465,15 +465,19 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the target float array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The float at the buffer's current position</returns>
+        <param name="dst">The array into which floats are to be written</param>
+        <param name="offset">The offset within the array of the first float to be
+                    written; must be non-negative and no larger than
+                    <c>dst.length</c></param>
+        <param name="length">The maximum number of floats to be written to the given
+                    array; must be non-negative and no larger than
+                    <c>dst.length - offset</c></param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#get(float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.get(float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -651,14 +655,14 @@
         <Parameter Name="src" Type="Java.Nio.FloatBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">the source float buffer.</param>
-        <param name="f">The float to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source buffer from which floats are to be read;
+                    must not be this buffer</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(float)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(float)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(java.nio.FloatBuffer)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(java.nio.FloatBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -742,14 +746,13 @@
         <Parameter Name="src" Type="System.Single[]" />
       </Parameters>
       <Docs>
-        <param name="src">the source float array.</param>
-        <param name="f">The float to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source array</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(float)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(float)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(float[])" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -788,14 +791,14 @@
         <Parameter Name="f" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than the limit.</param>
-        <param name="f">The float to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="index">The index at which the float will be written</param>
+        <param name="f">The float value to be written</param>
+        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(float)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(float)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(int,%20float)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -835,16 +838,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">the source float array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="f">The float to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The array from which floats are to be read</param>
+        <param name="offset">The offset within the array of the first float to be read;
+                    must be non-negative and no larger than <c>array.length</c></param>
+        <param name="length">The number of floats to be read from the given array;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(float)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(float)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#put(float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.put(float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1027,15 +1032,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="array">The array that will back this buffer</param>
+        <param name="array">The array that will back the new buffer</param>
+        <param name="offset">The offset of the subarray to be used; must be non-negative and
+                    no larger than <c>array.length</c>.  The new buffer's position
+                    will be set to this value.</param>
+        <param name="length">The length of the subarray to be used;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c>.
+                    The new buffer's limit will be set to <c>offset + length</c>.</param>
         <summary>Wraps a float array into a buffer.</summary>
         <returns>The new float buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#wrap(float[])" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.wrap(float[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/FloatBuffer#wrap(float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.FloatBuffer.wrap(float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/IntBuffer.xml b/docs/Mono.Android/en/Java.Nio/IntBuffer.xml
index 41ff890e53..54c7239525 100644
--- a/docs/Mono.Android/en/Java.Nio/IntBuffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/IntBuffer.xml
@@ -377,13 +377,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than limit.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The int at the buffer's current position</returns>
+        <param name="index">The index from which the int will be read</param>
+        <summary>Absolute <i>get</i> method.</summary>
+        <returns>The int at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#get(int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.get(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -420,13 +420,13 @@
         <Parameter Name="dst" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination int array.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The int at the buffer's current position</returns>
+        <param name="dst">The destination array</param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#get(int[])" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.get(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -465,15 +465,19 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the target int array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The int at the buffer's current position</returns>
+        <param name="dst">The array into which ints are to be written</param>
+        <param name="offset">The offset within the array of the first int to be
+                    written; must be non-negative and no larger than
+                    <c>dst.length</c></param>
+        <param name="length">The maximum number of ints to be written to the given
+                    array; must be non-negative and no larger than
+                    <c>dst.length - offset</c></param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#get(int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.get(int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -651,14 +655,14 @@
         <Parameter Name="src" Type="Java.Nio.IntBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">the source int buffer.</param>
-        <param name="i">The int to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source buffer from which ints are to be read;
+                    must not be this buffer</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(java.nio.IntBuffer)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(java.nio.IntBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -742,14 +746,13 @@
         <Parameter Name="src" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="src">the source int array.</param>
-        <param name="i">The int to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source array</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(int[])" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -788,14 +791,14 @@
         <Parameter Name="i" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than the limit.</param>
-        <param name="i">The int to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="index">The index at which the int will be written</param>
+        <param name="i">The int value to be written</param>
+        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -835,16 +838,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">the source int array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="i">The int to be written</param>
-        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The array from which ints are to be read</param>
+        <param name="offset">The offset within the array of the first int to be read;
+                    must be non-negative and no larger than <c>array.length</c></param>
+        <param name="length">The number of ints to be read from the given array;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#put(int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.put(int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1027,15 +1032,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="array">The array that will back this buffer</param>
+        <param name="array">The array that will back the new buffer</param>
+        <param name="offset">The offset of the subarray to be used; must be non-negative and
+                    no larger than <c>array.length</c>.  The new buffer's position
+                    will be set to this value.</param>
+        <param name="length">The length of the subarray to be used;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c>.
+                    The new buffer's limit will be set to <c>offset + length</c>.</param>
         <summary>Wraps an int array into a buffer.</summary>
         <returns>The new int buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/IntBuffer#wrap(int[])" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.wrap(int[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/IntBuffer#wrap(int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.IntBuffer.wrap(int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/LongBuffer.xml b/docs/Mono.Android/en/Java.Nio/LongBuffer.xml
index aea43254b4..517668eb11 100644
--- a/docs/Mono.Android/en/Java.Nio/LongBuffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/LongBuffer.xml
@@ -377,13 +377,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than limit.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The long at the buffer's current position</returns>
+        <param name="index">The index from which the long will be read</param>
+        <summary>Absolute <i>get</i> method.</summary>
+        <returns>The long at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#get(int)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.get(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -420,13 +420,13 @@
         <Parameter Name="dst" Type="System.Int64[]" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination long array.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The long at the buffer's current position</returns>
+        <param name="dst">The destination array</param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#get(long[])" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.get(long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -465,15 +465,19 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the target long array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The long at the buffer's current position</returns>
+        <param name="dst">The array into which longs are to be written</param>
+        <param name="offset">The offset within the array of the first long to be
+                    written; must be non-negative and no larger than
+                    <c>dst.length</c></param>
+        <param name="length">The maximum number of longs to be written to the given
+                    array; must be non-negative and no larger than
+                    <c>dst.length - offset</c></param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#get(long[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.get(long[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -651,15 +655,14 @@
         <Parameter Name="src" Type="Java.Nio.LongBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">the source long buffer.</param>
-        <param name="index">The index at which the long will be written</param>
-        <param name="l">The long value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source buffer from which longs are to be read;
+                    must not be this buffer</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(int,%20long)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(java.nio.LongBuffer)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(java.nio.LongBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -699,14 +702,13 @@
         <Parameter Name="l" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="index">The index at which the long will be written</param>
-        <param name="l">The long value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="l">The long to be written</param>
+        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(int,%20long)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(long)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -744,15 +746,13 @@
         <Parameter Name="src" Type="System.Int64[]" />
       </Parameters>
       <Docs>
-        <param name="src">the source long array.</param>
-        <param name="index">The index at which the long will be written</param>
-        <param name="l">The long value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source array</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(int,%20long)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(long[])" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -838,17 +838,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">the source long array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="index">The index at which the long will be written</param>
-        <param name="l">The long value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The array from which longs are to be read</param>
+        <param name="offset">The offset within the array of the first long to be read;
+                    must be non-negative and no larger than <c>array.length</c></param>
+        <param name="length">The number of longs to be read from the given array;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(int,%20long)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#put(long[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.put(long[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1031,15 +1032,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="array">The array that will back this buffer</param>
+        <param name="array">The array that will back the new buffer</param>
+        <param name="offset">The offset of the subarray to be used; must be non-negative and
+                    no larger than <c>array.length</c>.  The new buffer's position
+                    will be set to this value.</param>
+        <param name="length">The length of the subarray to be used;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c>.
+                    The new buffer's limit will be set to <c>offset + length</c>.</param>
         <summary>Wraps a long array into a buffer.</summary>
         <returns>The new long buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/LongBuffer#wrap(long[])" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.wrap(long[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/LongBuffer#wrap(long[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.LongBuffer.wrap(long[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Nio/ShortBuffer.xml b/docs/Mono.Android/en/Java.Nio/ShortBuffer.xml
index 3cd4bf7a5f..28b224f26c 100644
--- a/docs/Mono.Android/en/Java.Nio/ShortBuffer.xml
+++ b/docs/Mono.Android/en/Java.Nio/ShortBuffer.xml
@@ -377,13 +377,13 @@
         <Parameter Name="dst" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="dst">the destination short array.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The short at the buffer's current position</returns>
+        <param name="dst">The destination array</param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#get(short[])" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.get(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -420,13 +420,13 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the index, must not be negative and less than limit.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The short at the buffer's current position</returns>
+        <param name="index">The index from which the short will be read</param>
+        <summary>Absolute <i>get</i> method.</summary>
+        <returns>The short at the given index</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#get(int)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.get(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -465,15 +465,19 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dst">the target short array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Relative <i>get</i> method.</summary>
-        <returns>The short at the buffer's current position</returns>
+        <param name="dst">The array into which shorts are to be written</param>
+        <param name="offset">The offset within the array of the first short to be
+                    written; must be non-negative and no larger than
+                    <c>dst.length</c></param>
+        <param name="length">The maximum number of shorts to be written to the given
+                    array; must be non-negative and no larger than
+                    <c>dst.length - offset</c></param>
+        <summary>Relative bulk <i>get</i> method.</summary>
+        <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#get()" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#get(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.get(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -651,15 +655,14 @@
         <Parameter Name="src" Type="Java.Nio.ShortBuffer" />
       </Parameters>
       <Docs>
-        <param name="src">the source short buffer.</param>
-        <param name="index">The index at which the short will be written</param>
-        <param name="s">The short value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source buffer from which shorts are to be read;
+                    must not be this buffer</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(int,%20short)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(int, short)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(java.nio.ShortBuffer)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(java.nio.ShortBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -699,14 +702,13 @@
         <Parameter Name="s" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="index">The index at which the short will be written</param>
-        <param name="s">The short value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="s">The short to be written</param>
+        <summary>Relative <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(int,%20short)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(int, short)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(short)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(short)</code>.</a>
             </format>
           </para>
           <para>
@@ -744,15 +746,13 @@
         <Parameter Name="src" Type="System.Int16[]" />
       </Parameters>
       <Docs>
-        <param name="src">the source short array.</param>
-        <param name="index">The index at which the short will be written</param>
-        <param name="s">The short value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The source array</param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(int,%20short)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(int, short)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(short[])" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -838,17 +838,18 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="src">the source short array.</param>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="index">The index at which the short will be written</param>
-        <param name="s">The short value to be written</param>
-        <summary>Absolute <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
+        <param name="src">The array from which shorts are to be read</param>
+        <param name="offset">The offset within the array of the first short to be read;
+                    must be non-negative and no larger than <c>array.length</c></param>
+        <param name="length">The number of shorts to be read from the given array;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c></param>
+        <summary>Relative bulk <i>put</i> method&amp;nbsp;&amp;nbsp;<i>(optional operation)</i>.</summary>
         <returns>This buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(int,%20short)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(int, short)</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#put(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.put(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1031,15 +1032,20 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="array">The array that will back this buffer</param>
+        <param name="array">The array that will back the new buffer</param>
+        <param name="offset">The offset of the subarray to be used; must be non-negative and
+                    no larger than <c>array.length</c>.  The new buffer's position
+                    will be set to this value.</param>
+        <param name="length">The length of the subarray to be used;
+                    must be non-negative and no larger than
+                    <c>array.length - offset</c>.
+                    The new buffer's limit will be set to <c>offset + length</c>.</param>
         <summary>Wraps a short array into a buffer.</summary>
         <returns>The new short buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#wrap(short[])" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.wrap(short[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/nio/ShortBuffer#wrap(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.nio.ShortBuffer.wrap(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CRLException.xml b/docs/Mono.Android/en/Java.Security.Cert/CRLException.xml
index 3f6b12a7fe..24215222bc 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CRLException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CRLException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a CRLException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CRLException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CRLException#CRLException()" title="Reference documentation">Java documentation for <code>java.security.cert.CRLException.CRLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CRLException#CRLException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CRLException.CRLException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CRLException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CRLException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CRLException#CRLException()" title="Reference documentation">Java documentation for <code>java.security.cert.CRLException.CRLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CRLException#CRLException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CRLException.CRLException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a CRLException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CRLException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CRLException#CRLException()" title="Reference documentation">Java documentation for <code>java.security.cert.CRLException.CRLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CRLException#CRLException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CRLException.CRLException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertPath.xml b/docs/Mono.Android/en/Java.Security.Cert/CertPath.xml
index 999d4ad940..8e3ab6bb11 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertPath.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertPath.xml
@@ -230,14 +230,14 @@
         <Parameter Name="encoding" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="encoding">To be added.</param>
-        <summary>Returns the encoded form of this certification path, using the default
-            encoding.</summary>
+        <param name="encoding">the name of the encoding to use</param>
+        <summary>Returns the encoded form of this certification path, using the
+            specified encoding.</summary>
         <returns>the encoded bytes</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPath#getEncoded()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPath.getEncoded()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPath#getEncoded(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPath.getEncoded(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilder.xml b/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilder.xml
index 37451dc781..a125175a5b 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilder.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilder.xml
@@ -297,12 +297,12 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider.</param>
         <param name="algorithm">the name of the requested <c>CertPathBuilder</c>
              algorithm.  See the CertPathBuilder section in the &lt;a href=
              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertPathBuilder"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a <c>CertPathBuilder</c> object that implements the
             specified algorithm.</summary>
         <returns>a <c>CertPathBuilder</c> object that implements the
@@ -310,7 +310,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilder#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilder.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilder#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilder.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -350,12 +350,12 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider.</param>
         <param name="algorithm">the name of the requested <c>CertPathBuilder</c>
              algorithm.  See the CertPathBuilder section in the &lt;a href=
              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertPathBuilder"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a <c>CertPathBuilder</c> object that implements the
             specified algorithm.</summary>
         <returns>a <c>CertPathBuilder</c> object that implements the
@@ -363,7 +363,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilder#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilder.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilder#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilder.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilderException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilderException.xml
index 4250c07c72..4ba1d256e8 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilderException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertPathBuilderException.xml
@@ -89,13 +89,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Creates a <c>CertPathBuilderException</c> with <c>null</c>
-            as its detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+            <c>#getCause getCause()</c> method). (A <c>null</c> value is
+            permitted, and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertPathBuilderException</c> that wraps the specified
+            throwable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilderException#CertPathBuilderException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilderException.CertPathBuilderException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilderException#CertPathBuilderException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilderException.CertPathBuilderException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Creates a <c>CertPathBuilderException</c> with <c>null</c>
-            as its detail message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Creates a <c>CertPathBuilderException</c> with the given
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilderException#CertPathBuilderException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilderException.CertPathBuilderException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilderException#CertPathBuilderException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilderException.CertPathBuilderException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,14 +191,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Creates a <c>CertPathBuilderException</c> with <c>null</c>
-            as its detail message.</summary>
+        <param name="msg">the detail message</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+            <c>#getCause getCause()</c> method). (A <c>null</c> value is
+            permitted, and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertPathBuilderException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilderException#CertPathBuilderException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilderException.CertPathBuilderException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathBuilderException#CertPathBuilderException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathBuilderException.CertPathBuilderException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertPathValidator.xml b/docs/Mono.Android/en/Java.Security.Cert/CertPathValidator.xml
index 6446fbe2d3..d459de8e9b 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertPathValidator.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertPathValidator.xml
@@ -252,12 +252,12 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the security provider name.</param>
         <param name="algorithm">the name of the requested <c>CertPathValidator</c>
-             algorithm. See the CertPathValidator section in the &lt;a href=
-             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertPathValidator"&gt;
+            algorithm. See the CertPathValidator section in the &lt;a href=
+            "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertPathValidator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a <c>CertPathValidator</c> object that implements the
             specified algorithm.</summary>
         <returns>a <c>CertPathValidator</c> object that implements the
@@ -265,7 +265,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidator#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidator.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,12 +306,12 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the security provider name.</param>
         <param name="algorithm">the name of the requested <c>CertPathValidator</c>
              algorithm. See the CertPathValidator section in the &lt;a href=
              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertPathValidator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a <c>CertPathValidator</c> object that implements the
             specified algorithm.</summary>
         <returns>a <c>CertPathValidator</c> object that implements the
@@ -319,7 +319,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidator#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidator.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertPathValidatorException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertPathValidatorException.xml
index 2f3df3cdb6..2fddecf809 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertPathValidatorException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertPathValidatorException.xml
@@ -89,13 +89,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Creates a <c>CertPathValidatorException</c> with
-            no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+            <c>#getCause getCause()</c> method). (A <c>null</c> value is
+            permitted, and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertPathValidatorException</c> that wraps the
+            specified throwable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Creates a <c>CertPathValidatorException</c> with
-            no detail message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Creates a <c>CertPathValidatorException</c> with the given
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,14 +191,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Creates a <c>CertPathValidatorException</c> with
-            no detail message.</summary>
+        <param name="msg">the detail message</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+            <c>#getCause getCause()</c> method). (A <c>null</c> value is
+            permitted, and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertPathValidatorException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -231,16 +235,19 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="cause">To be added.</param>
-        <param name="certPath">To be added.</param>
-        <param name="index">To be added.</param>
-        <summary>Creates a <c>CertPathValidatorException</c> with
-            no detail message.</summary>
+        <param name="msg">the detail message (or <c>null</c> if none)</param>
+        <param name="cause">the cause (or <c>null</c> if none)</param>
+        <param name="certPath">the certification path that was in the process of
+            being validated when the error was encountered</param>
+        <param name="index">the index of the certificate in the certification path
+            that caused the error (or -1 if not applicable). Note that
+            the list of certificates in a <c>CertPath</c> is zero based.</param>
+        <summary>Creates a <c>CertPathValidatorException</c> with the specified
+            detail message, cause, certification path, and index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException#CertPathValidatorException(java.lang.String,%20java.lang.Throwable,%20java.security.cert.CertPath,%20int)" title="Reference documentation">Java documentation for <code>java.security.cert.CertPathValidatorException.CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertStore.xml b/docs/Mono.Android/en/Java.Security.Cert/CertStore.xml
index 577345504d..fe5445eabb 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertStore.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertStore.xml
@@ -355,22 +355,21 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider.</param>
-        <param name="type">the name of the requested <c>CertStore</c> type.
+        <param name="type">the requested <c>CertStore</c> type.
             See the CertStore section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertStore"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard types.</param>
         <param name="params">the initialization parameters (may be <c>null</c>).</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a <c>CertStore</c> object that implements the specified
-            <c>CertStore</c> type and is initialized with the specified
-            parameters.</summary>
-        <returns>a <c>CertStore</c> object that implements the specified
-                     <c>CertStore</c> type.</returns>
+            <c>CertStore</c> type.</summary>
+        <returns>a <c>CertStore</c> object that implements the
+                     specified type.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertStore#getInstance(java.lang.String,%20java.security.cert.CertStoreParameters)" title="Reference documentation">Java documentation for <code>java.security.cert.CertStore.getInstance(java.lang.String, java.security.cert.CertStoreParameters)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertStore#getInstance(java.lang.String,%20java.security.cert.CertStoreParameters,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.cert.CertStore.getInstance(java.lang.String, java.security.cert.CertStoreParameters, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -413,22 +412,21 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider.</param>
-        <param name="type">the name of the requested <c>CertStore</c> type.
+        <param name="type">the requested <c>CertStore</c> type.
             See the CertStore section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertStore"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard types.</param>
         <param name="params">the initialization parameters (may be <c>null</c>).</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a <c>CertStore</c> object that implements the specified
-            <c>CertStore</c> type and is initialized with the specified
-            parameters.</summary>
-        <returns>a <c>CertStore</c> object that implements the specified
-                     <c>CertStore</c> type.</returns>
+            <c>CertStore</c> type.</summary>
+        <returns>a <c>CertStore</c> object that implements the
+                     specified type.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertStore#getInstance(java.lang.String,%20java.security.cert.CertStoreParameters)" title="Reference documentation">Java documentation for <code>java.security.cert.CertStore.getInstance(java.lang.String, java.security.cert.CertStoreParameters)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertStore#getInstance(java.lang.String,%20java.security.cert.CertStoreParameters,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertStore.getInstance(java.lang.String, java.security.cert.CertStoreParameters, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertStoreException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertStoreException.xml
index 9b6f7e2e8f..564513fcaa 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertStoreException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertStoreException.xml
@@ -89,13 +89,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Creates a <c>CertStoreException</c> with <c>null</c> as
-            its detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+            <c>#getCause getCause()</c> method). (A <c>null</c> value is
+            permitted, and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertStoreException</c> that wraps the specified
+            throwable.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertStoreException#CertStoreException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertStoreException.CertStoreException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertStoreException#CertStoreException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertStoreException.CertStoreException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Creates a <c>CertStoreException</c> with <c>null</c> as
-            its detail message.</summary>
+        <param name="msg">the detail message</param>
+        <summary>Creates a <c>CertStoreException</c> with the given detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertStoreException#CertStoreException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertStoreException.CertStoreException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertStoreException#CertStoreException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertStoreException.CertStoreException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,14 +191,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Creates a <c>CertStoreException</c> with <c>null</c> as
-            its detail message.</summary>
+        <param name="msg">the detail message</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+            <c>#getCause getCause()</c> method). (A <c>null</c> value is
+            permitted, and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertStoreException</c> with the specified detail
+            message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertStoreException#CertStoreException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertStoreException.CertStoreException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertStoreException#CertStoreException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertStoreException.CertStoreException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/Certificate.xml b/docs/Mono.Android/en/Java.Security.Cert/Certificate.xml
index aed505e3df..3f792d597c 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/Certificate.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/Certificate.xml
@@ -421,14 +421,14 @@
         <Parameter Name="sigProvider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="sigProvider">To be added.</param>
         <param name="key">the PublicKey used to carry out the verification.</param>
+        <param name="sigProvider">the signature provider.</param>
         <summary>Verifies that this certificate was signed using the
             private key that corresponds to the specified public key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/Certificate#verify(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>java.security.cert.Certificate.verify(java.security.PublicKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/Certificate#verify(java.security.PublicKey,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.cert.Certificate.verify(java.security.PublicKey, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -463,14 +463,14 @@
         <Parameter Name="sigProvider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sigProvider">String the name of the signature provider.</param>
         <param name="key">the PublicKey used to carry out the verification.</param>
+        <param name="sigProvider">the name of the signature provider.</param>
         <summary>Verifies that this certificate was signed using the
             private key that corresponds to the specified public key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/Certificate#verify(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>java.security.cert.Certificate.verify(java.security.PublicKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/Certificate#verify(java.security.PublicKey,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.Certificate.verify(java.security.PublicKey, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertificateEncodingException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertificateEncodingException.xml
index 97d3524217..0d70b581c6 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertificateEncodingException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertificateEncodingException.xml
@@ -87,12 +87,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a CertificateEncodingException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertificateEncodingException</c>
+            with the specified cause and a detail message of
+            <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateEncodingException#CertificateEncodingException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateEncodingException.CertificateEncodingException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateEncodingException#CertificateEncodingException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateEncodingException.CertificateEncodingException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +130,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateEncodingException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateEncodingException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateEncodingException#CertificateEncodingException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateEncodingException.CertificateEncodingException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateEncodingException#CertificateEncodingException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateEncodingException.CertificateEncodingException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +192,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a CertificateEncodingException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertificateEncodingException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateEncodingException#CertificateEncodingException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateEncodingException.CertificateEncodingException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateEncodingException#CertificateEncodingException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateEncodingException.CertificateEncodingException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertificateException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertificateException.xml
index 7879a2a520..b1431530df 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertificateException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertificateException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a certificate exception with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertificateException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateException#CertificateException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateException.CertificateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateException#CertificateException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateException.CertificateException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a certificate exception with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a certificate exception with the given detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateException#CertificateException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateException.CertificateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateException#CertificateException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateException.CertificateException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a certificate exception with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertificateException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateException#CertificateException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateException.CertificateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateException#CertificateException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateException.CertificateException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertificateExpiredException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertificateExpiredException.xml
index 22938be80b..e3b06dd1aa 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertificateExpiredException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertificateExpiredException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateExpiredException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateExpiredException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateExpiredException#CertificateExpiredException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateExpiredException.CertificateExpiredException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateExpiredException#CertificateExpiredException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateExpiredException.CertificateExpiredException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertificateFactory.xml b/docs/Mono.Android/en/Java.Security.Cert/CertificateFactory.xml
index cabbdf213d..4c342e45af 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertificateFactory.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertificateFactory.xml
@@ -304,16 +304,15 @@
         <Parameter Name="certificates" Type="System.Collections.Generic.IList&lt;Java.Security.Cert.Certificate&gt;" />
       </Parameters>
       <Docs>
-        <param name="certificates">To be added.</param>
-        <param name="inStream">an <c>InputStream</c> containing the data</param>
+        <param name="certificates">a <c>List</c> of <c>Certificate</c>s</param>
         <summary>Generates a <c>CertPath</c> object and initializes it with
-            the data read from the <c>InputStream</c> inStream.</summary>
-        <returns>a <c>CertPath</c> initialized with the data from the
-              <c>InputStream</c></returns>
+            a <c>List</c> of <c>Certificate</c>s.</summary>
+        <returns>a <c>CertPath</c> initialized with the supplied list of
+              certificates</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#generateCertPath(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.generateCertPath(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#generateCertPath(java.util.List)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.generateCertPath(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -394,8 +393,8 @@
         <Parameter Name="encoding" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="encoding">To be added.</param>
         <param name="inStream">an <c>InputStream</c> containing the data</param>
+        <param name="encoding">the encoding used for the data</param>
         <summary>Generates a <c>CertPath</c> object and initializes it with
             the data read from the <c>InputStream</c> inStream.</summary>
         <returns>a <c>CertPath</c> initialized with the data from the
@@ -403,7 +402,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#generateCertPath(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.generateCertPath(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#generateCertPath(java.io.InputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.generateCertPath(java.io.InputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -684,20 +683,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider providing certificates of the
-            specified type.</param>
-        <param name="type">the name of the requested certificate type.
+        <param name="type">the certificate type.
             See the CertificateFactory section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertificateFactory"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard certificate types.</param>
-        <summary>Returns a certificate factory object that implements the
-            specified certificate type.</summary>
+        <param name="provider">the provider.</param>
+        <summary>Returns a certificate factory object for the specified
+            certificate type.</summary>
         <returns>a certificate factory object for the specified type.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -738,20 +736,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider providing certificates of the
-            specified type.</param>
-        <param name="type">the name of the requested certificate type.
+        <param name="type">the certificate type.
             See the CertificateFactory section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#CertificateFactory"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard certificate types.</param>
-        <summary>Returns a certificate factory object that implements the
-            specified certificate type.</summary>
+        <param name="provider">the name of the provider.</param>
+        <summary>Returns a certificate factory object for the specified
+            certificate type.</summary>
         <returns>a certificate factory object for the specified type.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactory#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactory.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertificateFactorySpi.xml b/docs/Mono.Android/en/Java.Security.Cert/CertificateFactorySpi.xml
index dd48298aca..b01e41ccde 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertificateFactorySpi.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertificateFactorySpi.xml
@@ -196,16 +196,15 @@
         <Parameter Name="certificates" Type="System.Collections.Generic.IList&lt;Java.Security.Cert.Certificate&gt;" />
       </Parameters>
       <Docs>
-        <param name="certificates">To be added.</param>
-        <param name="inStream">an <c>InputStream</c> containing the data</param>
+        <param name="certificates">a <c>List</c> of <c>Certificate</c>s</param>
         <summary>Generates a <c>CertPath</c> object and initializes it with
-            the data read from the <c>InputStream</c> inStream.</summary>
-        <returns>a <c>CertPath</c> initialized with the data from the
-              <c>InputStream</c></returns>
+            a <c>List</c> of <c>Certificate</c>s.</summary>
+        <returns>a <c>CertPath</c> initialized with the supplied list of
+              certificates</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi#engineGenerateCertPath(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactorySpi.engineGenerateCertPath(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi#engineGenerateCertPath(java.util.List)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactorySpi.engineGenerateCertPath(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
@@ -286,8 +285,8 @@
         <Parameter Name="encoding" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="encoding">To be added.</param>
         <param name="inStream">an <c>InputStream</c> containing the data</param>
+        <param name="encoding">the encoding used for the data</param>
         <summary>Generates a <c>CertPath</c> object and initializes it with
             the data read from the <c>InputStream</c> inStream.</summary>
         <returns>a <c>CertPath</c> initialized with the data from the
@@ -295,7 +294,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi#engineGenerateCertPath(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactorySpi.engineGenerateCertPath(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi#engineGenerateCertPath(java.io.InputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateFactorySpi.engineGenerateCertPath(java.io.InputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertificateNotYetValidException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertificateNotYetValidException.xml
index b114a5e559..7f9d9fe19e 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertificateNotYetValidException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertificateNotYetValidException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateNotYetValidException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateNotYetValidException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateNotYetValidException#CertificateNotYetValidException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateNotYetValidException.CertificateNotYetValidException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateNotYetValidException#CertificateNotYetValidException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateNotYetValidException.CertificateNotYetValidException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CertificateParsingException.xml b/docs/Mono.Android/en/Java.Security.Cert/CertificateParsingException.xml
index 2fd922e820..77c12b9d4d 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CertificateParsingException.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CertificateParsingException.xml
@@ -87,12 +87,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a CertificateParsingException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertificateParsingException</c> with the
+            specified cause and a detail message of
+            <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateParsingException#CertificateParsingException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateParsingException.CertificateParsingException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateParsingException#CertificateParsingException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateParsingException.CertificateParsingException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +130,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateParsingException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateParsingException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateParsingException#CertificateParsingException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateParsingException.CertificateParsingException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateParsingException#CertificateParsingException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateParsingException.CertificateParsingException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +192,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a CertificateParsingException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>CertificateParsingException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CertificateParsingException#CertificateParsingException()" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateParsingException.CertificateParsingException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CertificateParsingException#CertificateParsingException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.cert.CertificateParsingException.CertificateParsingException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/CollectionCertStoreParameters.xml b/docs/Mono.Android/en/Java.Security.Cert/CollectionCertStoreParameters.xml
index 70e957782b..517e131de3 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/CollectionCertStoreParameters.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/CollectionCertStoreParameters.xml
@@ -106,14 +106,15 @@
         <Parameter Name="collection" Type="System.Collections.Generic.ICollection&lt;System.Object&gt;" />
       </Parameters>
       <Docs>
-        <param name="collection">To be added.</param>
-        <summary>Creates an instance of <c>CollectionCertStoreParameters</c> with
-            the default parameter values (an empty and immutable
-            <c>Collection</c>).</summary>
+        <param name="collection">a <c>Collection</c> of
+                   <c>Certificate</c>s and <c>CRL</c>s</param>
+        <summary>Creates an instance of <c>CollectionCertStoreParameters</c>
+            which will allow certificates and CRLs to be retrieved from the
+            specified <c>Collection</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/CollectionCertStoreParameters#CollectionCertStoreParameters()" title="Reference documentation">Java documentation for <code>java.security.cert.CollectionCertStoreParameters.CollectionCertStoreParameters()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/CollectionCertStoreParameters#CollectionCertStoreParameters(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.security.cert.CollectionCertStoreParameters.CollectionCertStoreParameters(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/LDAPCertStoreParameters.xml b/docs/Mono.Android/en/Java.Security.Cert/LDAPCertStoreParameters.xml
index e871d62a65..04921eb146 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/LDAPCertStoreParameters.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/LDAPCertStoreParameters.xml
@@ -104,13 +104,13 @@
         <Parameter Name="serverName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="serverName">To be added.</param>
+        <param name="serverName">the DNS name of the LDAP server</param>
         <summary>Creates an instance of <c>LDAPCertStoreParameters</c> with the
-            default parameter values (server name "localhost", port 389).</summary>
+            specified server name and a default port of 389.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters#LDAPCertStoreParameters()" title="Reference documentation">Java documentation for <code>java.security.cert.LDAPCertStoreParameters.LDAPCertStoreParameters()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters#LDAPCertStoreParameters(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.LDAPCertStoreParameters.LDAPCertStoreParameters(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -168,14 +168,14 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="serverName">To be added.</param>
-        <param name="port">To be added.</param>
+        <param name="serverName">the DNS name of the LDAP server</param>
+        <param name="port">the port number of the LDAP server</param>
         <summary>Creates an instance of <c>LDAPCertStoreParameters</c> with the
-            default parameter values (server name "localhost", port 389).</summary>
+            specified parameter values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters#LDAPCertStoreParameters()" title="Reference documentation">Java documentation for <code>java.security.cert.LDAPCertStoreParameters.LDAPCertStoreParameters()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters#LDAPCertStoreParameters(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.security.cert.LDAPCertStoreParameters.LDAPCertStoreParameters(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/PKIXBuilderParameters.xml b/docs/Mono.Android/en/Java.Security.Cert/PKIXBuilderParameters.xml
index e1ea0c5432..2484683c7d 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/PKIXBuilderParameters.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/PKIXBuilderParameters.xml
@@ -103,18 +103,15 @@
         <Parameter Name="targetConstraints" Type="Java.Security.Cert.ICertSelector" />
       </Parameters>
       <Docs>
-        <param name="trustAnchors">To be added.</param>
-        <param name="keystore">a <c>KeyStore</c> from which the set of
-            most-trusted CAs will be populated</param>
+        <param name="trustAnchors">a <c>Set</c> of <c>TrustAnchor</c>s</param>
         <param name="targetConstraints">a <c>CertSelector</c> specifying the
             constraints on the target certificate</param>
-        <summary>Creates an instance of <c>PKIXBuilderParameters</c> that
-            populates the set of most-trusted CAs from the trusted
-            certificate entries contained in the specified <c>KeyStore</c>.</summary>
+        <summary>Creates an instance of <c>PKIXBuilderParameters</c> with
+            the specified <c>Set</c> of most-trusted CAs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/PKIXBuilderParameters#PKIXBuilderParameters(java.security.KeyStore,%20java.security.cert.CertSelector)" title="Reference documentation">Java documentation for <code>java.security.cert.PKIXBuilderParameters.PKIXBuilderParameters(java.security.KeyStore, java.security.cert.CertSelector)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/PKIXBuilderParameters#PKIXBuilderParameters(java.util.Set,%20java.security.cert.CertSelector)" title="Reference documentation">Java documentation for <code>java.security.cert.PKIXBuilderParameters.PKIXBuilderParameters(java.util.Set, java.security.cert.CertSelector)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/PKIXCertPathChecker.xml b/docs/Mono.Android/en/Java.Security.Cert/PKIXCertPathChecker.xml
index f9a7545c2d..a787170ad0 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/PKIXCertPathChecker.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/PKIXCertPathChecker.xml
@@ -173,13 +173,17 @@
         <Parameter Name="unresolvedCritExts" Type="System.Collections.Generic.ICollection&lt;System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="cert">To be added.</param>
-        <param name="unresolvedCritExts">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
+        <param name="cert">the <c>Certificate</c> to be checked</param>
+        <param name="unresolvedCritExts">a <c>Collection</c> of OID strings
+            representing the current set of unresolved critical extensions</param>
+        <summary>Performs the check(s) on the specified certificate using its internal
+            state and removes any critical extensions that it processes from the
+            specified collection of OID strings that represent the unresolved
+            critical extensions.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker#check(java.security.cert.Certificate)" title="Reference documentation">Java documentation for <code>java.security.cert.PKIXCertPathChecker.check(java.security.cert.Certificate)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker#check(java.security.cert.Certificate,%20java.util.Collection)" title="Reference documentation">Java documentation for <code>java.security.cert.PKIXCertPathChecker.check(java.security.cert.Certificate, java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/PKIXParameters.xml b/docs/Mono.Android/en/Java.Security.Cert/PKIXParameters.xml
index 1455f69898..35b2e82517 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/PKIXParameters.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/PKIXParameters.xml
@@ -115,16 +115,13 @@
         <Parameter Name="trustAnchors" Type="System.Collections.Generic.ICollection&lt;Java.Security.Cert.TrustAnchor&gt;" />
       </Parameters>
       <Docs>
-        <param name="trustAnchors">To be added.</param>
-        <param name="keystore">a <c>KeyStore</c> from which the set of
-            most-trusted CAs will be populated</param>
-        <summary>Creates an instance of <c>PKIXParameters</c> that
-            populates the set of most-trusted CAs from the trusted
-            certificate entries contained in the specified <c>KeyStore</c>.</summary>
+        <param name="trustAnchors">a <c>Set</c> of <c>TrustAnchor</c>s</param>
+        <summary>Creates an instance of <c>PKIXParameters</c> with the specified
+            <c>Set</c> of most-trusted CAs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/PKIXParameters#PKIXParameters(java.security.KeyStore)" title="Reference documentation">Java documentation for <code>java.security.cert.PKIXParameters.PKIXParameters(java.security.KeyStore)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/PKIXParameters#PKIXParameters(java.util.Set)" title="Reference documentation">Java documentation for <code>java.security.cert.PKIXParameters.PKIXParameters(java.util.Set)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/TrustAnchor.xml b/docs/Mono.Android/en/Java.Security.Cert/TrustAnchor.xml
index 1e130416f4..bd3deed3f6 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/TrustAnchor.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/TrustAnchor.xml
@@ -55,21 +55,19 @@
         <Parameter Name="nameConstraints" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="trustedCert">To be added.</param>
-        <param name="caName">the X.500 distinguished name of the most-trusted CA in
-            &lt;a href="http://www.ietf.org/rfc/rfc2253.txt"&gt;RFC 2253&lt;/a&gt;
-            <c>String</c> format</param>
-        <param name="pubKey">the public key of the most-trusted CA</param>
+        <param name="trustedCert">a trusted <c>X509Certificate</c></param>
         <param name="nameConstraints">a byte array containing the ASN.1 DER encoding of
             a NameConstraints extension to be used for checking name constraints.
             Only the value of the extension is included, not the OID or criticality
             flag. Specify <c>null</c> to omit the parameter.</param>
-        <summary>Creates an instance of <c>TrustAnchor</c> where the
-            most-trusted CA is specified as a distinguished name and public key.</summary>
+        <summary>Creates an instance of <c>TrustAnchor</c> with the specified
+            <c>X509Certificate</c> and optional name constraints, which
+            are intended to be used as additional constraints when validating
+            an X.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/TrustAnchor#TrustAnchor(java.lang.String,%20java.security.PublicKey,%20byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.TrustAnchor.TrustAnchor(java.lang.String, java.security.PublicKey, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/TrustAnchor#TrustAnchor(java.security.cert.X509Certificate,%20byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.TrustAnchor.TrustAnchor(java.security.cert.X509Certificate, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -128,21 +126,18 @@
         <Parameter Name="nameConstraints" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="caPrincipal">To be added.</param>
-        <param name="caName">the X.500 distinguished name of the most-trusted CA in
-            &lt;a href="http://www.ietf.org/rfc/rfc2253.txt"&gt;RFC 2253&lt;/a&gt;
-            <c>String</c> format</param>
+        <param name="caPrincipal">the name of the most-trusted CA as X500Principal</param>
         <param name="pubKey">the public key of the most-trusted CA</param>
         <param name="nameConstraints">a byte array containing the ASN.1 DER encoding of
             a NameConstraints extension to be used for checking name constraints.
             Only the value of the extension is included, not the OID or criticality
             flag. Specify <c>null</c> to omit the parameter.</param>
         <summary>Creates an instance of <c>TrustAnchor</c> where the
-            most-trusted CA is specified as a distinguished name and public key.</summary>
+            most-trusted CA is specified as an X500Principal and public key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/TrustAnchor#TrustAnchor(java.lang.String,%20java.security.PublicKey,%20byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.TrustAnchor.TrustAnchor(java.lang.String, java.security.PublicKey, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/TrustAnchor#TrustAnchor(javax.security.auth.x500.X500Principal,%20java.security.PublicKey,%20byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.TrustAnchor.TrustAnchor(javax.security.auth.x500.X500Principal, java.security.PublicKey, byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/X509CRL.xml b/docs/Mono.Android/en/Java.Security.Cert/X509CRL.xml
index 996e4634de..dc1b966f33 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/X509CRL.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/X509CRL.xml
@@ -285,16 +285,15 @@
         <Parameter Name="certificate" Type="Java.Security.Cert.X509Certificate" />
       </Parameters>
       <Docs>
-        <param name="certificate">the certificate to search a CRL entry for.</param>
-        <param name="serialNumber">the serial number of the certificate for which a CRL entry
-            is to be looked up</param>
-        <summary>Gets the CRL entry, if any, with the given certificate serialNumber.</summary>
-        <returns>the entry with the given serial number, or null if no such entry
-            exists in this CRL.</returns>
+        <param name="certificate">the certificate for which a CRL entry is to be looked
+              up</param>
+        <summary>Get the CRL entry, if any, for the given certificate.</summary>
+        <returns>the entry for the given certificate, or null if no such entry
+              exists in this CRL.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CRL#getRevokedCertificate(java.math.BigInteger)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRL.getRevokedCertificate(java.math.BigInteger)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CRL#getRevokedCertificate(java.security.cert.X509Certificate)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRL.getRevokedCertificate(java.security.cert.X509Certificate)</code>.</a>
             </format>
           </para>
           <para>
@@ -863,14 +862,14 @@
         <Parameter Name="sigProvider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="sigProvider">To be added.</param>
         <param name="key">the PublicKey used to carry out the verification.</param>
+        <param name="sigProvider">the signature provider.</param>
         <summary>Verifies that this CRL was signed using the
             private key that corresponds to the given public key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CRL#verify(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRL.verify(java.security.PublicKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CRL#verify(java.security.PublicKey,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRL.verify(java.security.PublicKey, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -905,14 +904,14 @@
         <Parameter Name="sigProvider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sigProvider">the name of the provider for the signature algorithm.</param>
         <param name="key">the PublicKey used to carry out the verification.</param>
+        <param name="sigProvider">the name of the signature provider.</param>
         <summary>Verifies that this CRL was signed using the
             private key that corresponds to the given public key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CRL#verify(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRL.verify(java.security.PublicKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CRL#verify(java.security.PublicKey,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRL.verify(java.security.PublicKey, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/X509CRLSelector.xml b/docs/Mono.Android/en/Java.Security.Cert/X509CRLSelector.xml
index 9b514cf4ec..8737d21d62 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/X509CRLSelector.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/X509CRLSelector.xml
@@ -170,14 +170,12 @@
         <Parameter Name="name" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="name">the name in RFC 2253 form</param>
-        <summary>&lt;strong&gt;Denigrated&lt;/strong&gt;, use
-            #addIssuer(X500Principal) or
-            #addIssuerName(byte[]) instead.</summary>
+        <param name="name">a byte array containing the name in ASN.1 DER encoded form</param>
+        <summary>Adds a name to the issuerNames criterion.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CRLSelector#addIssuerName(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRLSelector.addIssuerName(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CRLSelector#addIssuerName(byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.X509CRLSelector.addIssuerName(byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/X509CertSelector.xml b/docs/Mono.Android/en/Java.Security.Cert/X509CertSelector.xml
index bece1980af..6ec1a92f8a 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/X509CertSelector.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/X509CertSelector.xml
@@ -133,12 +133,12 @@
       <Docs>
         <param name="type">the name type (0-8, as specified in
                         RFC 3280, section 4.2.1.7)</param>
-        <param name="name">the name in string form</param>
+        <param name="name">a byte array containing the name in ASN.1 DER encoded form</param>
         <summary>Adds a name to the pathToNames criterion.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#addPathToName(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.addPathToName(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#addPathToName(int,%20byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.addPathToName(int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -219,14 +219,13 @@
         <Parameter Name="name" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="type">the name type (0-8, as specified in
-                        RFC 3280, section 4.2.1.7)</param>
-        <param name="name">the name in string form (not <c>null</c>)</param>
+        <param name="type">the name type (0-8, as listed above)</param>
+        <param name="name">a byte array containing the name in ASN.1 DER encoded form</param>
         <summary>Adds a name to the subjectAlternativeNames criterion.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#addSubjectAlternativeName(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.addSubjectAlternativeName(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#addSubjectAlternativeName(int,%20byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.addSubjectAlternativeName(int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -802,10 +801,9 @@
         <ReturnType>Javax.Security.Auth.X500.X500Principal</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="issuerDN">a distinguished name in RFC 2253 format
+        <param name="issuer">a distinguished name as X500Principal
                             (or <c>null</c>)</param>
-        <summary>Returns the issuer criterion as an <c>X500Principal</c>. -or- &lt;strong&gt;Denigrated&lt;/strong&gt;, use #setIssuer(X500Principal)
-            or #setIssuer(byte[]) instead.</summary>
+        <summary>Returns the issuer criterion as an <c>X500Principal</c>. -or- Sets the issuer criterion.</summary>
         <value>the required issuer distinguished name as X500Principal
                     (or <c>null</c>)</value>
         <remarks>
@@ -818,7 +816,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setIssuer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setIssuer(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setIssuer(javax.security.auth.x500.X500Principal)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setIssuer(javax.security.auth.x500.X500Principal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1277,14 +1275,13 @@
         <Parameter Name="issuerDN" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="issuerDN">a distinguished name in RFC 2253 format
-                            (or <c>null</c>)</param>
-        <summary>&lt;strong&gt;Denigrated&lt;/strong&gt;, use #setIssuer(X500Principal)
-            or #setIssuer(byte[]) instead.</summary>
+        <param name="issuerDN">a byte array containing the distinguished name
+                            in ASN.1 DER encoded form (or <c>null</c>)</param>
+        <summary>Sets the issuer criterion.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setIssuer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setIssuer(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setIssuer(byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setIssuer(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1455,14 +1452,13 @@
         <Parameter Name="subjectDN" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="subjectDN">a distinguished name in RFC 2253 format
-                             (or <c>null</c>)</param>
-        <summary>&lt;strong&gt;Denigrated&lt;/strong&gt;, use #setSubject(X500Principal)
-            or #setSubject(byte[]) instead.</summary>
+        <param name="subjectDN">a byte array containing the distinguished name in
+                             ASN.1 DER format (or <c>null</c>)</param>
+        <summary>Sets the subject criterion.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setSubject(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setSubject(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setSubject(byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setSubject(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1583,12 +1579,13 @@
         <Parameter Name="key" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="key">the subject public key to check for (or <c>null</c>)</param>
+        <param name="key">a byte array containing the subject public key in ASN.1 DER
+                       form (or <c>null</c>)</param>
         <summary>Sets the subjectPublicKey criterion.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setSubjectPublicKey(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setSubjectPublicKey(java.security.PublicKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setSubjectPublicKey(byte[])" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setSubjectPublicKey(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1626,10 +1623,9 @@
         <ReturnType>Javax.Security.Auth.X500.X500Principal</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="subjectDN">a distinguished name in RFC 2253 format
+        <param name="subject">a distinguished name as X500Principal
                              (or <c>null</c>)</param>
-        <summary>Returns the subject criterion as an <c>X500Principal</c>. -or- &lt;strong&gt;Denigrated&lt;/strong&gt;, use #setSubject(X500Principal)
-            or #setSubject(byte[]) instead.</summary>
+        <summary>Returns the subject criterion as an <c>X500Principal</c>. -or- Sets the subject criterion.</summary>
         <value>the required subject distinguished name as X500Principal
                     (or <c>null</c>)</value>
         <remarks>
@@ -1642,7 +1638,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setSubject(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setSubject(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509CertSelector#setSubject(javax.security.auth.x500.X500Principal)" title="Reference documentation">Java documentation for <code>java.security.cert.X509CertSelector.setSubject(javax.security.auth.x500.X500Principal)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Cert/X509Certificate.xml b/docs/Mono.Android/en/Java.Security.Cert/X509Certificate.xml
index 5ba148c12e..f95941d7ad 100644
--- a/docs/Mono.Android/en/Java.Security.Cert/X509Certificate.xml
+++ b/docs/Mono.Android/en/Java.Security.Cert/X509Certificate.xml
@@ -194,12 +194,14 @@
         <Parameter Name="date" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="date">the date to check the validity against.</param>
-        <summary>Checks that the certificate is currently valid.</summary>
+        <param name="date">the Date to check against to see if this certificate
+                   is valid at that date/time.</param>
+        <summary>Checks that the given date is within the certificate's
+            validity period.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/cert/X509Certificate#checkValidity()" title="Reference documentation">Java documentation for <code>java.security.cert.X509Certificate.checkValidity()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/cert/X509Certificate#checkValidity(java.util.Date)" title="Reference documentation">Java documentation for <code>java.security.cert.X509Certificate.checkValidity(java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Interfaces/IDSAKeyPairGenerator.xml b/docs/Mono.Android/en/Java.Security.Interfaces/IDSAKeyPairGenerator.xml
index 6cb6797521..bab0602f34 100644
--- a/docs/Mono.Android/en/Java.Security.Interfaces/IDSAKeyPairGenerator.xml
+++ b/docs/Mono.Android/en/Java.Security.Interfaces/IDSAKeyPairGenerator.xml
@@ -65,19 +65,15 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="params">the parameter values.</param>
-        <param name="modlen">the modulus length in bits. Valid values are any
-            multiple of 64 between 512 and 1024, inclusive, 2048, and 3072.</param>
+        <param name="params">the parameters to use to generate the keys.</param>
         <param name="random">the random bit source to use to generate key bits;
             can be null.</param>
-        <param name="genParams">whether or not to generate new parameters for
-            the modulus length requested.</param>
-        <summary>Initializes the key pair generator for a given modulus length
-            (instead of parameters), and an optional SecureRandom bit source.</summary>
+        <summary>Initializes the key pair generator using the DSA family parameters
+            (p,q and g) and an optional SecureRandom bit source.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/interfaces/DSAKeyPairGenerator#initialize(int,%20boolean,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.interfaces.DSAKeyPairGenerator.initialize(int, boolean, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/interfaces/DSAKeyPairGenerator#initialize(java.security.interfaces.DSAParams,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.interfaces.DSAKeyPairGenerator.initialize(java.security.interfaces.DSAParams, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Spec/ECFieldF2m.xml b/docs/Mono.Android/en/Java.Security.Spec/ECFieldF2m.xml
index c824ccd9ae..3f59efc692 100644
--- a/docs/Mono.Android/en/Java.Security.Spec/ECFieldF2m.xml
+++ b/docs/Mono.Android/en/Java.Security.Spec/ECFieldF2m.xml
@@ -109,14 +109,16 @@
         <Parameter Name="rp" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="rp">To be added.</param>
         <param name="m">with 2^<c>m</c> being the number of elements.</param>
+        <param name="rp">the BigInteger whose i-th bit corresponds to
+            the i-th coefficient of the reduction polynomial.</param>
         <summary>Creates an elliptic curve characteristic 2 finite
-            field which has 2^<c>m</c> elements with normal basis.</summary>
+            field which has 2^<c>m</c> elements with
+            polynomial basis.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/ECFieldF2m#ECFieldF2m(int)" title="Reference documentation">Java documentation for <code>java.security.spec.ECFieldF2m.ECFieldF2m(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/ECFieldF2m#ECFieldF2m(int,%20java.math.BigInteger)" title="Reference documentation">Java documentation for <code>java.security.spec.ECFieldF2m.ECFieldF2m(int, java.math.BigInteger)</code>.</a>
             </format>
           </para>
           <para>
@@ -151,14 +153,17 @@
         <Parameter Name="ks" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="ks">To be added.</param>
         <param name="m">with 2^<c>m</c> being the number of elements.</param>
+        <param name="ks">the order of the middle term(s) of the
+            reduction polynomial. Contents of this array are copied
+            to protect against subsequent modification.</param>
         <summary>Creates an elliptic curve characteristic 2 finite
-            field which has 2^<c>m</c> elements with normal basis.</summary>
+            field which has 2^<c>m</c> elements with
+            polynomial basis.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/ECFieldF2m#ECFieldF2m(int)" title="Reference documentation">Java documentation for <code>java.security.spec.ECFieldF2m.ECFieldF2m(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/ECFieldF2m#ECFieldF2m(int,%20int[])" title="Reference documentation">Java documentation for <code>java.security.spec.ECFieldF2m.ECFieldF2m(int, int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Spec/EllipticCurve.xml b/docs/Mono.Android/en/Java.Security.Spec/EllipticCurve.xml
index d16982d9d2..d984fe27d0 100644
--- a/docs/Mono.Android/en/Java.Security.Spec/EllipticCurve.xml
+++ b/docs/Mono.Android/en/Java.Security.Spec/EllipticCurve.xml
@@ -126,17 +126,19 @@
         <Parameter Name="seed" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="seed">To be added.</param>
         <param name="field">the finite field that this elliptic curve is over.</param>
         <param name="a">the first coefficient of this elliptic curve.</param>
         <param name="b">the second coefficient of this elliptic curve.</param>
+        <param name="seed">the bytes used during curve generation for later
+            validation. Contents of this array are copied to protect against
+            subsequent modification.</param>
         <summary>Creates an elliptic curve with the specified elliptic field
-            <c>field</c> and the coefficients <c>a</c> and
-            <c>b</c>.</summary>
+            <c>field</c>, the coefficients <c>a</c> and
+            <c>b</c>, and the <c>seed</c> used for curve generation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/EllipticCurve#EllipticCurve(java.security.spec.ECField,%20java.math.BigInteger,%20java.math.BigInteger)" title="Reference documentation">Java documentation for <code>java.security.spec.EllipticCurve.EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/EllipticCurve#EllipticCurve(java.security.spec.ECField,%20java.math.BigInteger,%20java.math.BigInteger,%20byte[])" title="Reference documentation">Java documentation for <code>java.security.spec.EllipticCurve.EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger, byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Spec/InvalidKeySpecException.xml b/docs/Mono.Android/en/Java.Security.Spec/InvalidKeySpecException.xml
index 8982ab8996..0250a430b9 100644
--- a/docs/Mono.Android/en/Java.Security.Spec/InvalidKeySpecException.xml
+++ b/docs/Mono.Android/en/Java.Security.Spec/InvalidKeySpecException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an InvalidKeySpecException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>InvalidKeySpecException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/InvalidKeySpecException#InvalidKeySpecException()" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidKeySpecException.InvalidKeySpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/InvalidKeySpecException#InvalidKeySpecException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidKeySpecException.InvalidKeySpecException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an InvalidKeySpecException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an InvalidKeySpecException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/InvalidKeySpecException#InvalidKeySpecException()" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidKeySpecException.InvalidKeySpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/InvalidKeySpecException#InvalidKeySpecException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidKeySpecException.InvalidKeySpecException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an InvalidKeySpecException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>InvalidKeySpecException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/InvalidKeySpecException#InvalidKeySpecException()" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidKeySpecException.InvalidKeySpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/InvalidKeySpecException#InvalidKeySpecException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidKeySpecException.InvalidKeySpecException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Spec/InvalidParameterSpecException.xml b/docs/Mono.Android/en/Java.Security.Spec/InvalidParameterSpecException.xml
index 00ef9f962c..ff8181357e 100644
--- a/docs/Mono.Android/en/Java.Security.Spec/InvalidParameterSpecException.xml
+++ b/docs/Mono.Android/en/Java.Security.Spec/InvalidParameterSpecException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an InvalidParameterSpecException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an InvalidParameterSpecException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/InvalidParameterSpecException#InvalidParameterSpecException()" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidParameterSpecException.InvalidParameterSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/InvalidParameterSpecException#InvalidParameterSpecException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.spec.InvalidParameterSpecException.InvalidParameterSpecException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security.Spec/PSSParameterSpec.xml b/docs/Mono.Android/en/Java.Security.Spec/PSSParameterSpec.xml
index 2dc06f429f..8820450e25 100644
--- a/docs/Mono.Android/en/Java.Security.Spec/PSSParameterSpec.xml
+++ b/docs/Mono.Android/en/Java.Security.Spec/PSSParameterSpec.xml
@@ -69,13 +69,15 @@
         <Parameter Name="saltLen" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="saltLen">To be added.</param>
-        <summary>Constructs a new <c>PSSParameterSpec</c> as defined in
-            the PKCS #1 standard using the default values.</summary>
+        <param name="saltLen">the length of salt in bits to be used in PKCS#1
+            PSS encoding.</param>
+        <summary>Creates a new <c>PSSParameterSpec</c>
+            using the specified salt length and other default values as
+            defined in PKCS#1.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec#PSSParameterSpec()" title="Reference documentation">Java documentation for <code>java.security.spec.PSSParameterSpec.PSSParameterSpec()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec#PSSParameterSpec(int)" title="Reference documentation">Java documentation for <code>java.security.spec.PSSParameterSpec.PSSParameterSpec(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -136,17 +138,22 @@
         <Parameter Name="trailerField" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="mdName">To be added.</param>
-        <param name="mgfName">To be added.</param>
-        <param name="mgfSpec">To be added.</param>
-        <param name="saltLen">To be added.</param>
-        <param name="trailerField">To be added.</param>
-        <summary>Constructs a new <c>PSSParameterSpec</c> as defined in
-            the PKCS #1 standard using the default values.</summary>
+        <param name="mdName">the algorithm name of the hash function.</param>
+        <param name="mgfName">the algorithm name of the mask generation
+            function.</param>
+        <param name="mgfSpec">the parameters for the mask generation
+            function. If null is specified, null will be returned by
+            getMGFParameters().</param>
+        <param name="saltLen">the length of salt.</param>
+        <param name="trailerField">the value of the trailer field.</param>
+        <summary>Creates a new <c>PSSParameterSpec</c> as defined in
+            the PKCS #1 standard using the specified message digest,
+            mask generation function, parameters for mask generation
+            function, salt length, and trailer field values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec#PSSParameterSpec()" title="Reference documentation">Java documentation for <code>java.security.spec.PSSParameterSpec.PSSParameterSpec()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec#PSSParameterSpec(java.lang.String,%20java.lang.String,%20java.security.spec.AlgorithmParameterSpec,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.spec.PSSParameterSpec.PSSParameterSpec(java.lang.String, java.lang.String, java.security.spec.AlgorithmParameterSpec, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/AccessControlException.xml b/docs/Mono.Android/en/Java.Security/AccessControlException.xml
index e0e5b62a16..2e9806ec6a 100644
--- a/docs/Mono.Android/en/Java.Security/AccessControlException.xml
+++ b/docs/Mono.Android/en/Java.Security/AccessControlException.xml
@@ -118,14 +118,15 @@
         <Parameter Name="p" Type="Java.Security.Permission" />
       </Parameters>
       <Docs>
-        <param name="p">To be added.</param>
         <param name="s">the detail message.</param>
+        <param name="p">the permission that caused the exception.</param>
         <summary>Constructs an <c>AccessControlException</c> with the
-            specified, detailed message.</summary>
+            specified, detailed message, and the requested permission that caused
+            the exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AccessControlException#AccessControlException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AccessControlException.AccessControlException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AccessControlException#AccessControlException(java.lang.String,%20java.security.Permission)" title="Reference documentation">Java documentation for <code>java.security.AccessControlException.AccessControlException(java.lang.String, java.security.Permission)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/AccessController.xml b/docs/Mono.Android/en/Java.Security/AccessController.xml
index 01657904bf..1caa31f549 100644
--- a/docs/Mono.Android/en/Java.Security/AccessController.xml
+++ b/docs/Mono.Android/en/Java.Security/AccessController.xml
@@ -173,7 +173,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivileged(java.security.PrivilegedAction)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivileged(java.security.PrivilegedAction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivileged(java.security.PrivilegedExceptionAction)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivileged(java.security.PrivilegedExceptionAction)</code>.</a>
             </format>
           </para>
           <para>
@@ -219,7 +219,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivileged(java.security.PrivilegedAction)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivileged(java.security.PrivilegedAction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivileged(java.security.PrivilegedAction,%20java.security.AccessControlContext)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivileged(java.security.PrivilegedAction, java.security.AccessControlContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,7 +265,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivileged(java.security.PrivilegedAction)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivileged(java.security.PrivilegedAction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivileged(java.security.PrivilegedExceptionAction,%20java.security.AccessControlContext)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivileged(java.security.PrivilegedExceptionAction, java.security.AccessControlContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -353,7 +353,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivilegedWithCombiner(java.security.PrivilegedAction)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivilegedWithCombiner(java.security.PrivilegedAction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AccessController#doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction)" title="Reference documentation">Java documentation for <code>java.security.AccessController.doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/AlgorithmParameterGenerator.xml b/docs/Mono.Android/en/Java.Security/AlgorithmParameterGenerator.xml
index a9bfb5ce5b..db9739e960 100644
--- a/docs/Mono.Android/en/Java.Security/AlgorithmParameterGenerator.xml
+++ b/docs/Mono.Android/en/Java.Security/AlgorithmParameterGenerator.xml
@@ -250,20 +250,20 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider of the <c>AlgorithmParameterGenerator</c>.</param>
-        <param name="algorithm">the name of the algorithm this
+        <param name="algorithm">the string name of the algorithm this
             parameter generator is associated with.
             See the AlgorithmParameterGenerator section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the Provider object.</param>
         <summary>Returns an AlgorithmParameterGenerator object for generating
             a set of parameters to be used with the specified algorithm.</summary>
         <returns>the new AlgorithmParameterGenerator object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -302,20 +302,20 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">name of the provider of the <c>AlgorithmParameterGenerator</c>.</param>
         <param name="algorithm">the name of the algorithm this
             parameter generator is associated with.
             See the AlgorithmParameterGenerator section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the string name of the Provider.</param>
         <summary>Returns an AlgorithmParameterGenerator object for generating
             a set of parameters to be used with the specified algorithm.</summary>
         <returns>the new AlgorithmParameterGenerator object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -355,13 +355,13 @@
         <Parameter Name="genParamSpec" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="genParamSpec">the parameters to use.</param>
-        <param name="size">the size (number of bits).</param>
-        <summary>Initializes this parameter generator for a certain size.</summary>
+        <param name="genParamSpec">the set of algorithm-specific parameter generation values.</param>
+        <summary>Initializes this parameter generator with a set of algorithm-specific
+            parameter generation values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#init(int)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.init(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#init(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.init(java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
@@ -439,14 +439,14 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="genParamSpec">the parameters to use.</param>
+        <param name="genParamSpec">the set of algorithm-specific parameter generation values.</param>
         <param name="random">the source of randomness.</param>
-        <param name="size">the size (number of bits).</param>
-        <summary>Initializes this parameter generator for a certain size.</summary>
+        <summary>Initializes this parameter generator with a set of algorithm-specific
+            parameter generation values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#init(int)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.init(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#init(java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.init(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -484,14 +484,14 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="random">the source of randomness.
-</param>
         <param name="size">the size (number of bits).</param>
-        <summary>Initializes this parameter generator for a certain size.</summary>
+        <param name="random">the source of randomness.</param>
+        <summary>Initializes this parameter generator for a certain size and source
+            of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#init(int)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.init(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator#init(int,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGenerator.init(int, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/AlgorithmParameterGeneratorSpi.xml b/docs/Mono.Android/en/Java.Security/AlgorithmParameterGeneratorSpi.xml
index c44afe1e93..d87b444633 100644
--- a/docs/Mono.Android/en/Java.Security/AlgorithmParameterGeneratorSpi.xml
+++ b/docs/Mono.Android/en/Java.Security/AlgorithmParameterGeneratorSpi.xml
@@ -145,15 +145,14 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="genParamSpec">the parameters to use.</param>
-        <param name="size">the size (number of bits).</param>
+        <param name="genParamSpec">the set of algorithm-specific parameter generation values.</param>
         <param name="random">the source of randomness.</param>
-        <summary>Initializes this parameter generator for a certain size
-            and source of randomness.</summary>
+        <summary>Initializes this parameter generator with a set of
+            algorithm-specific parameter generation values.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGeneratorSpi#engineInit(int,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGeneratorSpi.engineInit(int, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameterGeneratorSpi#engineInit(java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameterGeneratorSpi.engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/AlgorithmParameters.xml b/docs/Mono.Android/en/Java.Security/AlgorithmParameters.xml
index 3f6b21b186..cfb27cd59b 100644
--- a/docs/Mono.Android/en/Java.Security/AlgorithmParameters.xml
+++ b/docs/Mono.Android/en/Java.Security/AlgorithmParameters.xml
@@ -200,12 +200,12 @@
       </Parameters>
       <Docs>
         <param name="format">the name of the encoding format.</param>
-        <summary>Returns the parameters in their primary encoding format.</summary>
-        <returns>the parameters encoded using their primary encoding format.</returns>
+        <summary>Returns the parameters encoded in the specified scheme.</summary>
+        <returns>the parameters encoded using the specified encoding scheme.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#getEncoded()" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.getEncoded()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#getEncoded(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.getEncoded(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -292,18 +292,18 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider of the <c>AlgorithmParameters</c>.</param>
         <param name="algorithm">the name of the algorithm requested.
             See the AlgorithmParameters section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#AlgorithmParameters"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a parameter object for the specified algorithm.</summary>
         <returns>the new parameter object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -342,18 +342,18 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">name of the provider of the <c>AlgorithmParameters</c>.</param>
         <param name="algorithm">the name of the algorithm requested.
             See the AlgorithmParameters section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#AlgorithmParameters"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a parameter object for the specified algorithm.</summary>
         <returns>the new parameter object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -485,13 +485,12 @@
       </Parameters>
       <Docs>
         <param name="params">the encoded parameters.</param>
-        <param name="paramSpec">the parameter specification.</param>
-        <summary>Initializes this parameter object using the parameters
-            specified in <c>paramSpec</c>.</summary>
+        <summary>Imports the specified parameters and decodes them according to the
+            primary decoding format for parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#init(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.init(java.security.spec.AlgorithmParameterSpec)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#init(byte[])" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.init(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -531,14 +530,13 @@
       </Parameters>
       <Docs>
         <param name="params">the encoded parameters.</param>
-        <param name="format">the name of the decoding format.</param>
-        <param name="paramSpec">the parameter specification.</param>
-        <summary>Initializes this parameter object using the parameters
-            specified in <c>paramSpec</c>.</summary>
+        <param name="format">the name of the decoding scheme.</param>
+        <summary>Imports the parameters from <c>params</c> and decodes them
+            according to the specified decoding scheme.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#init(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.init(java.security.spec.AlgorithmParameterSpec)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParameters#init(byte[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParameters.init(byte[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/AlgorithmParametersSpi.xml b/docs/Mono.Android/en/Java.Security/AlgorithmParametersSpi.xml
index 55a05d97ba..553982c9b1 100644
--- a/docs/Mono.Android/en/Java.Security/AlgorithmParametersSpi.xml
+++ b/docs/Mono.Android/en/Java.Security/AlgorithmParametersSpi.xml
@@ -149,12 +149,12 @@
       </Parameters>
       <Docs>
         <param name="format">the name of the encoding format.</param>
-        <summary>Returns the parameters in their primary encoding format.</summary>
-        <returns>the parameters encoded using their primary encoding format.</returns>
+        <summary>Returns the parameters encoded in the specified format.</summary>
+        <returns>the parameters encoded using the specified encoding scheme.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParametersSpi#engineGetEncoded()" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParametersSpi.engineGetEncoded()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParametersSpi#engineGetEncoded(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParametersSpi.engineGetEncoded(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -285,13 +285,12 @@
       </Parameters>
       <Docs>
         <param name="params">the encoded parameters.</param>
-        <param name="paramSpec">the parameter specification.</param>
-        <summary>Initializes this parameters object using the parameters
-            specified in <c>paramSpec</c>.</summary>
+        <summary>Imports the specified parameters and decodes them
+            according to the primary decoding format for parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParametersSpi#engineInit(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParametersSpi.engineInit(java.security.spec.AlgorithmParameterSpec)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParametersSpi#engineInit(byte[])" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParametersSpi.engineInit(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -332,13 +331,12 @@
       <Docs>
         <param name="params">the encoded parameters.</param>
         <param name="format">the name of the decoding format.</param>
-        <param name="paramSpec">the parameter specification.</param>
-        <summary>Initializes this parameters object using the parameters
-            specified in <c>paramSpec</c>.</summary>
+        <summary>Imports the parameters from <c>params</c> and
+            decodes them according to the specified decoding format.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmParametersSpi#engineInit(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParametersSpi.engineInit(java.security.spec.AlgorithmParameterSpec)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmParametersSpi#engineInit(byte[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmParametersSpi.engineInit(byte[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/DigestException.xml b/docs/Mono.Android/en/Java.Security/DigestException.xml
index a740ee27b0..5fbb71829a 100644
--- a/docs/Mono.Android/en/Java.Security/DigestException.xml
+++ b/docs/Mono.Android/en/Java.Security/DigestException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a DigestException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>DigestException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/DigestException#DigestException()" title="Reference documentation">Java documentation for <code>java.security.DigestException.DigestException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/DigestException#DigestException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.DigestException.DigestException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a DigestException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a DigestException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/DigestException#DigestException()" title="Reference documentation">Java documentation for <code>java.security.DigestException.DigestException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/DigestException#DigestException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.DigestException.DigestException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a DigestException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>DigestException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/DigestException#DigestException()" title="Reference documentation">Java documentation for <code>java.security.DigestException.DigestException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/DigestException#DigestException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.DigestException.DigestException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/GeneralSecurityException.xml b/docs/Mono.Android/en/Java.Security/GeneralSecurityException.xml
index 14ce352d58..14e73e393d 100644
--- a/docs/Mono.Android/en/Java.Security/GeneralSecurityException.xml
+++ b/docs/Mono.Android/en/Java.Security/GeneralSecurityException.xml
@@ -89,12 +89,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a GeneralSecurityException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>GeneralSecurityException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/GeneralSecurityException#GeneralSecurityException()" title="Reference documentation">Java documentation for <code>java.security.GeneralSecurityException.GeneralSecurityException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/GeneralSecurityException#GeneralSecurityException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.GeneralSecurityException.GeneralSecurityException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,12 +131,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a GeneralSecurityException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a GeneralSecurityException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/GeneralSecurityException#GeneralSecurityException()" title="Reference documentation">Java documentation for <code>java.security.GeneralSecurityException.GeneralSecurityException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/GeneralSecurityException#GeneralSecurityException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.GeneralSecurityException.GeneralSecurityException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,13 +193,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a GeneralSecurityException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>GeneralSecurityException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/GeneralSecurityException#GeneralSecurityException()" title="Reference documentation">Java documentation for <code>java.security.GeneralSecurityException.GeneralSecurityException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/GeneralSecurityException#GeneralSecurityException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.GeneralSecurityException.GeneralSecurityException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/IAlgorithmConstraints.xml b/docs/Mono.Android/en/Java.Security/IAlgorithmConstraints.xml
index f2695ba6b6..48246b5ab1 100644
--- a/docs/Mono.Android/en/Java.Security/IAlgorithmConstraints.xml
+++ b/docs/Mono.Android/en/Java.Security/IAlgorithmConstraints.xml
@@ -65,19 +65,16 @@
         <Parameter Name="key" Type="Java.Security.IKey" />
       </Parameters>
       <Docs>
-        <param name="key">To be added.</param>
         <param name="primitives">a set of cryptographic primitives</param>
-        <param name="algorithm">the algorithm name</param>
-        <param name="parameters">the algorithm parameters, or null if no additional
-                parameters</param>
-        <summary>Determines whether an algorithm is granted permission for the
-            specified cryptographic primitives.</summary>
-        <returns>true if the algorithm is permitted and can be used for all
-                of the specified cryptographic primitives</returns>
+        <param name="key">the key</param>
+        <summary>Determines whether a key is granted permission for the specified
+            cryptographic primitives.</summary>
+        <returns>true if the key can be used for all of the specified
+                cryptographic primitives</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmConstraints#permits(java.util.Set,%20java.lang.String,%20java.security.AlgorithmParameters)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmConstraints.permits(java.util.Set, java.lang.String, java.security.AlgorithmParameters)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmConstraints#permits(java.util.Set,%20java.security.Key)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmConstraints.permits(java.util.Set, java.security.Key)</code>.</a>
             </format>
           </para>
           <para>
@@ -161,19 +158,19 @@
         <Parameter Name="parameters" Type="Java.Security.AlgorithmParameters" />
       </Parameters>
       <Docs>
-        <param name="key">To be added.</param>
         <param name="primitives">a set of cryptographic primitives</param>
         <param name="algorithm">the algorithm name</param>
+        <param name="key">the key</param>
         <param name="parameters">the algorithm parameters, or null if no additional
                 parameters</param>
-        <summary>Determines whether an algorithm is granted permission for the
-            specified cryptographic primitives.</summary>
-        <returns>true if the algorithm is permitted and can be used for all
-                of the specified cryptographic primitives</returns>
+        <summary>Determines whether an algorithm and the corresponding key are granted
+            permission for the specified cryptographic primitives.</summary>
+        <returns>true if the key and the algorithm can be used for all of the
+                specified cryptographic primitives</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/AlgorithmConstraints#permits(java.util.Set,%20java.lang.String,%20java.security.AlgorithmParameters)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmConstraints.permits(java.util.Set, java.lang.String, java.security.AlgorithmParameters)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/AlgorithmConstraints#permits(java.util.Set,%20java.lang.String,%20java.security.Key,%20java.security.AlgorithmParameters)" title="Reference documentation">Java documentation for <code>java.security.AlgorithmConstraints.permits(java.util.Set, java.lang.String, java.security.Key, java.security.AlgorithmParameters)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/Identity.xml b/docs/Mono.Android/en/Java.Security/Identity.xml
index d955f0793a..7d0659d4b4 100644
--- a/docs/Mono.Android/en/Java.Security/Identity.xml
+++ b/docs/Mono.Android/en/Java.Security/Identity.xml
@@ -117,12 +117,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Constructor for serialization only.</summary>
+        <param name="name">the identity name.</param>
+        <summary>Constructs an identity with the specified name and no scope.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Identity#Identity()" title="Reference documentation">Java documentation for <code>java.security.Identity.Identity()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Identity#Identity(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.Identity.Identity(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -182,13 +182,13 @@
         <Parameter Name="scope" Type="Java.Security.IdentityScope" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="scope">To be added.</param>
-        <summary>Constructor for serialization only.</summary>
+        <param name="name">the identity name.</param>
+        <param name="scope">the scope of the identity.</param>
+        <summary>Constructs an identity with the specified name and scope.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Identity#Identity()" title="Reference documentation">Java documentation for <code>java.security.Identity.Identity()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Identity#Identity(java.lang.String,%20java.security.IdentityScope)" title="Reference documentation">Java documentation for <code>java.security.Identity.Identity(java.lang.String, java.security.IdentityScope)</code>.</a>
             </format>
           </para>
           <para>
@@ -757,15 +757,17 @@
         <Parameter Name="detailed" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="detailed">whether or not this method should return detailed information.</param>
-        <summary>Returns a short string describing this identity, telling its
-            name and its scope (if any).</summary>
-        <returns>information about this identity, such as its name and the
-            name of its scope (if any).</returns>
+        <param name="detailed">whether or not to provide detailed information.</param>
+        <summary>Returns a string representation of this identity, with
+            optionally more details than that provided by the
+            <c>toString</c> method without any arguments.</summary>
+        <returns>information about this identity. If <c>detailed</c>
+            is true, then this method returns more information than that
+            provided by the <c>toString</c> method without any arguments.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Identity#toString()" title="Reference documentation">Java documentation for <code>java.security.Identity.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Identity#toString(boolean)" title="Reference documentation">Java documentation for <code>java.security.Identity.toString(boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/IdentityScope.xml b/docs/Mono.Android/en/Java.Security/IdentityScope.xml
index 832494e592..695265b1ff 100644
--- a/docs/Mono.Android/en/Java.Security/IdentityScope.xml
+++ b/docs/Mono.Android/en/Java.Security/IdentityScope.xml
@@ -100,13 +100,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>This constructor is used for serialization only and should not
-            be used by subclasses.</summary>
+        <param name="name">the scope name.</param>
+        <summary>Constructs a new identity scope with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/IdentityScope#IdentityScope()" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.IdentityScope()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/IdentityScope#IdentityScope(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.IdentityScope(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -166,14 +165,13 @@
         <Parameter Name="scope" Type="Java.Security.IdentityScope" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="scope">To be added.</param>
-        <summary>This constructor is used for serialization only and should not
-            be used by subclasses.</summary>
+        <param name="name">the scope name.</param>
+        <param name="scope">the scope for the new identity scope.</param>
+        <summary>Constructs a new identity scope with the specified name and scope.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/IdentityScope#IdentityScope()" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.IdentityScope()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/IdentityScope#IdentityScope(java.lang.String,%20java.security.IdentityScope)" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.IdentityScope(java.lang.String, java.security.IdentityScope)</code>.</a>
             </format>
           </para>
           <para>
@@ -257,15 +255,17 @@
         <Parameter Name="principal" Type="Java.Security.IPrincipal" />
       </Parameters>
       <Docs>
-        <param name="principal">the <c>Principal</c> whose name is used to lookup the <c>Identity</c> to be returned.</param>
-        <param name="name">the name of the identity to be retrieved.</param>
-        <summary>Returns the identity in this scope with the specified name (if any).</summary>
-        <returns>the identity named <c>name</c>, or null if there are
-            no identities named <c>name</c> in this scope.</returns>
+        <param name="principal">the principal corresponding to the identity
+            to be retrieved.</param>
+        <summary>Retrieves the identity whose name is the same as that of the
+            specified principal.</summary>
+        <returns>the identity whose name is the same as that of the
+            principal, or null if there are no identities of the same name
+            in this scope.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/IdentityScope#getIdentity(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.getIdentity(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/IdentityScope#getIdentity(java.security.Principal)" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.getIdentity(java.security.Principal)</code>.</a>
             </format>
           </para>
           <para>
@@ -300,15 +300,14 @@
         <Parameter Name="key" Type="Java.Security.IPublicKey" />
       </Parameters>
       <Docs>
-        <param name="key">the <c>PublicKey</c> of the <c>Identity</c> to be returned.</param>
-        <param name="name">the name of the identity to be retrieved.</param>
-        <summary>Returns the identity in this scope with the specified name (if any).</summary>
-        <returns>the identity named <c>name</c>, or null if there are
-            no identities named <c>name</c> in this scope.</returns>
+        <param name="key">the public key for the identity to be returned.</param>
+        <summary>Retrieves the identity with the specified public key.</summary>
+        <returns>the identity with the given key, or null if there are
+            no identities in this scope with that key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/IdentityScope#getIdentity(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.getIdentity(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/IdentityScope#getIdentity(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>java.security.IdentityScope.getIdentity(java.security.PublicKey)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/InvalidAlgorithmParameterException.xml b/docs/Mono.Android/en/Java.Security/InvalidAlgorithmParameterException.xml
index fdbd60ad22..184acfc0e7 100644
--- a/docs/Mono.Android/en/Java.Security/InvalidAlgorithmParameterException.xml
+++ b/docs/Mono.Android/en/Java.Security/InvalidAlgorithmParameterException.xml
@@ -88,13 +88,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an InvalidAlgorithmParameterException with no detail
-            message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>InvalidAlgorithmParameterException</c> with the
+            specified cause and a detail message of
+            <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/InvalidAlgorithmParameterException#InvalidAlgorithmParameterException()" title="Reference documentation">Java documentation for <code>java.security.InvalidAlgorithmParameterException.InvalidAlgorithmParameterException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/InvalidAlgorithmParameterException#InvalidAlgorithmParameterException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.InvalidAlgorithmParameterException.InvalidAlgorithmParameterException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +131,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an InvalidAlgorithmParameterException with no detail
-            message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an InvalidAlgorithmParameterException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/InvalidAlgorithmParameterException#InvalidAlgorithmParameterException()" title="Reference documentation">Java documentation for <code>java.security.InvalidAlgorithmParameterException.InvalidAlgorithmParameterException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/InvalidAlgorithmParameterException#InvalidAlgorithmParameterException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.InvalidAlgorithmParameterException.InvalidAlgorithmParameterException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,14 +193,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an InvalidAlgorithmParameterException with no detail
-            message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>InvalidAlgorithmParameterException</c> with the
+            specified detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/InvalidAlgorithmParameterException#InvalidAlgorithmParameterException()" title="Reference documentation">Java documentation for <code>java.security.InvalidAlgorithmParameterException.InvalidAlgorithmParameterException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/InvalidAlgorithmParameterException#InvalidAlgorithmParameterException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.InvalidAlgorithmParameterException.InvalidAlgorithmParameterException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/InvalidKeyException.xml b/docs/Mono.Android/en/Java.Security/InvalidKeyException.xml
index 8f8d89ea43..ec2d2c162e 100644
--- a/docs/Mono.Android/en/Java.Security/InvalidKeyException.xml
+++ b/docs/Mono.Android/en/Java.Security/InvalidKeyException.xml
@@ -88,12 +88,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an InvalidKeyException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>InvalidKeyException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/InvalidKeyException#InvalidKeyException()" title="Reference documentation">Java documentation for <code>java.security.InvalidKeyException.InvalidKeyException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/InvalidKeyException#InvalidKeyException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.InvalidKeyException.InvalidKeyException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +130,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an InvalidKeyException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an InvalidKeyException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/InvalidKeyException#InvalidKeyException()" title="Reference documentation">Java documentation for <code>java.security.InvalidKeyException.InvalidKeyException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/InvalidKeyException#InvalidKeyException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.InvalidKeyException.InvalidKeyException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +192,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an InvalidKeyException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>InvalidKeyException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/InvalidKeyException#InvalidKeyException()" title="Reference documentation">Java documentation for <code>java.security.InvalidKeyException.InvalidKeyException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/InvalidKeyException#InvalidKeyException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.InvalidKeyException.InvalidKeyException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/InvalidParameterException.xml b/docs/Mono.Android/en/Java.Security/InvalidParameterException.xml
index 8f5d41b931..a109580b6a 100644
--- a/docs/Mono.Android/en/Java.Security/InvalidParameterException.xml
+++ b/docs/Mono.Android/en/Java.Security/InvalidParameterException.xml
@@ -89,12 +89,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an InvalidParameterException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an InvalidParameterException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/InvalidParameterException#InvalidParameterException()" title="Reference documentation">Java documentation for <code>java.security.InvalidParameterException.InvalidParameterException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/InvalidParameterException#InvalidParameterException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.InvalidParameterException.InvalidParameterException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/KeyException.xml b/docs/Mono.Android/en/Java.Security/KeyException.xml
index 7d536690ef..5cbba1e078 100644
--- a/docs/Mono.Android/en/Java.Security/KeyException.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a KeyException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>KeyException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyException#KeyException()" title="Reference documentation">Java documentation for <code>java.security.KeyException.KeyException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyException#KeyException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.KeyException.KeyException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,12 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a KeyException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a KeyException with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyException#KeyException()" title="Reference documentation">Java documentation for <code>java.security.KeyException.KeyException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyException#KeyException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyException.KeyException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +190,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a KeyException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>KeyException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyException#KeyException()" title="Reference documentation">Java documentation for <code>java.security.KeyException.KeyException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyException#KeyException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.KeyException.KeyException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/KeyFactory.xml b/docs/Mono.Android/en/Java.Security/KeyFactory.xml
index 5870813c27..46b3c46078 100644
--- a/docs/Mono.Android/en/Java.Security/KeyFactory.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyFactory.xml
@@ -301,19 +301,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the security provider.</param>
         <param name="algorithm">the name of the requested key algorithm.
             See the KeyFactory section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyFactory"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a KeyFactory object that converts
             public/private keys of the specified algorithm.</summary>
         <returns>the new KeyFactory object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyFactory#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.KeyFactory.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -351,19 +351,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider.</param>
         <param name="algorithm">the name of the requested key algorithm.
             See the KeyFactory section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyFactory"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a KeyFactory object that converts
             public/private keys of the specified algorithm.</summary>
         <returns>the new KeyFactory object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyFactory#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyFactory.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/KeyManagementException.xml b/docs/Mono.Android/en/Java.Security/KeyManagementException.xml
index ab3cc56b1c..5e6b8cc041 100644
--- a/docs/Mono.Android/en/Java.Security/KeyManagementException.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyManagementException.xml
@@ -88,12 +88,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a KeyManagementException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>KeyManagementException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyManagementException#KeyManagementException()" title="Reference documentation">Java documentation for <code>java.security.KeyManagementException.KeyManagementException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyManagementException#KeyManagementException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.KeyManagementException.KeyManagementException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +130,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a KeyManagementException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a KeyManagementException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyManagementException#KeyManagementException()" title="Reference documentation">Java documentation for <code>java.security.KeyManagementException.KeyManagementException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyManagementException#KeyManagementException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyManagementException.KeyManagementException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +192,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a KeyManagementException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>KeyManagementException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyManagementException#KeyManagementException()" title="Reference documentation">Java documentation for <code>java.security.KeyManagementException.KeyManagementException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyManagementException#KeyManagementException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.KeyManagementException.KeyManagementException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/KeyPairGenerator.xml b/docs/Mono.Android/en/Java.Security/KeyPairGenerator.xml
index 7ab8804fc5..be4544920b 100644
--- a/docs/Mono.Android/en/Java.Security/KeyPairGenerator.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyPairGenerator.xml
@@ -284,19 +284,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider</param>
         <param name="algorithm">the standard string name of the algorithm.
             See the KeyPairGenerator section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyPairGenerator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a KeyPairGenerator object that generates public/private
             key pairs for the specified algorithm.</summary>
         <returns>the new KeyPairGenerator object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -335,19 +335,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider</param>
         <param name="algorithm">the standard string name of the algorithm.
             See the KeyPairGenerator section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyPairGenerator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the string name of the provider.</param>
         <summary>Returns a KeyPairGenerator object that generates public/private
             key pairs for the specified algorithm.</summary>
         <returns>the new KeyPairGenerator object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -386,18 +386,15 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
-        <param name="keysize">the keysize. This is an
-            algorithm-specific metric, such as modulus length, specified in
-            number of bits.</param>
-        <summary>Initializes the key pair generator for a certain keysize using
-            a default parameter set and the <c>SecureRandom</c>
+        <param name="params">the parameter set used to generate the keys.</param>
+        <summary>Initializes the key pair generator using the specified parameter
+            set and the <c>SecureRandom</c>
             implementation of the highest-priority installed provider as the source
             of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#initialize(int)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.initialize(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#initialize(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.initialize(java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
@@ -480,19 +477,16 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="random">the source of randomness
-</param>
         <param name="keysize">the keysize. This is an
             algorithm-specific metric, such as modulus length, specified in
             number of bits.</param>
-        <summary>Initializes the key pair generator for a certain keysize using
-            a default parameter set and the <c>SecureRandom</c>
-            implementation of the highest-priority installed provider as the source
-            of randomness.</summary>
+        <param name="random">the source of randomness.</param>
+        <summary>Initializes the key pair generator for a certain keysize with
+            the given source of randomness (and a default parameter set).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#initialize(int)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.initialize(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyPairGenerator#initialize(int,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGenerator.initialize(int, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/KeyPairGeneratorSpi.xml b/docs/Mono.Android/en/Java.Security/KeyPairGeneratorSpi.xml
index 595c82fbe1..ae24598a95 100644
--- a/docs/Mono.Android/en/Java.Security/KeyPairGeneratorSpi.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyPairGeneratorSpi.xml
@@ -145,17 +145,14 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters to use.</param>
-        <param name="keysize">the keysize. This is an
-            algorithm-specific metric, such as modulus length, specified in
-            number of bits.</param>
+        <param name="params">the parameter set used to generate the keys.</param>
         <param name="random">the source of randomness for this generator.</param>
-        <summary>Initializes the key pair generator for a certain keysize, using
-            the default parameter set.</summary>
+        <summary>Initializes the key pair generator using the specified parameter
+            set and user-provided source of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyPairGeneratorSpi#initialize(int,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGeneratorSpi.initialize(int, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyPairGeneratorSpi#initialize(java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.KeyPairGeneratorSpi.initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/KeyStore.xml b/docs/Mono.Android/en/Java.Security/KeyStore.xml
index 8413d0295d..4917ae637c 100644
--- a/docs/Mono.Android/en/Java.Security/KeyStore.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyStore.xml
@@ -616,18 +616,18 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider of the <c>KeyStore</c>.</param>
         <param name="type">the type of keystore.
             See the KeyStore section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyStore"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard keystore types.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a keystore object of the specified type.</summary>
         <returns>a keystore object of the specified type.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyStore#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyStore.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyStore#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.KeyStore.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -668,18 +668,18 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">name of the provider of the <c>KeyStore</c>.</param>
         <param name="type">the type of keystore.
             See the KeyStore section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyStore"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard keystore types.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a keystore object of the specified type.</summary>
         <returns>a keystore object of the specified type.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyStore#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyStore.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyStore#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyStore.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -896,11 +896,6 @@
       <Docs>
         <param name="param">the <c>LoadStoreParameter</c> that specifies how to load this
             <c>KeyStore</c>, maybe <c>null</c>.</param>
-        <param name="stream">the input stream from which the keystore is loaded,
-            or <c>null</c></param>
-        <param name="password">the password used to check the integrity of
-            the keystore, the password used to unlock the keystore,
-            or <c>null</c></param>
         <summary>Loads this KeyStore from the given input stream.</summary>
         <remarks>
           <para>
@@ -1132,17 +1127,16 @@
       </Parameters>
       <Docs>
         <param name="alias">the alias name</param>
-        <param name="key">the key to be associated with the alias</param>
-        <param name="password">the password to protect the key</param>
+        <param name="key">the key (in protected format) to be associated with the alias</param>
         <param name="chain">the certificate chain for the corresponding public
-            key (only required if the given key is of type
-            <c>java.security.PrivateKey</c>).</param>
-        <summary>Assigns the given key to the given alias, protecting it with the given
-            password.</summary>
+                     key (only useful if the protected key is of type
+                     <c>java.security.PrivateKey</c>).</param>
+        <summary>Assigns the given key (that has already been protected) to the given
+            alias.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyStore#setKeyEntry(java.lang.String,%20java.security.Key,%20char[],%20java.security.cert.Certificate[])" title="Reference documentation">Java documentation for <code>java.security.KeyStore.setKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyStore#setKeyEntry(java.lang.String,%20byte[],%20java.security.cert.Certificate[])" title="Reference documentation">Java documentation for <code>java.security.KeyStore.setKeyEntry(java.lang.String, byte[], java.security.cert.Certificate[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1279,8 +1273,6 @@
       <Docs>
         <param name="param">the <c>LoadStoreParameter</c> that specifies how to store
             this <c>KeyStore</c>, maybe <c>null</c>.</param>
-        <param name="stream">the output stream to which this keystore is written.</param>
-        <param name="password">the password to generate the keystore integrity check</param>
         <summary>Stores this keystore to the given output stream, and protects its
             integrity with the given password.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Security/KeyStoreException.xml b/docs/Mono.Android/en/Java.Security/KeyStoreException.xml
index 8531775c59..d45c419c53 100644
--- a/docs/Mono.Android/en/Java.Security/KeyStoreException.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyStoreException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a KeyStoreException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>KeyStoreException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyStoreException#KeyStoreException()" title="Reference documentation">Java documentation for <code>java.security.KeyStoreException.KeyStoreException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyStoreException#KeyStoreException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.KeyStoreException.KeyStoreException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a KeyStoreException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a KeyStoreException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyStoreException#KeyStoreException()" title="Reference documentation">Java documentation for <code>java.security.KeyStoreException.KeyStoreException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyStoreException#KeyStoreException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.KeyStoreException.KeyStoreException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a KeyStoreException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>KeyStoreException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyStoreException#KeyStoreException()" title="Reference documentation">Java documentation for <code>java.security.KeyStoreException.KeyStoreException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyStoreException#KeyStoreException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.KeyStoreException.KeyStoreException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/KeyStoreSpi.xml b/docs/Mono.Android/en/Java.Security/KeyStoreSpi.xml
index 888441cc0b..8475fc1f66 100644
--- a/docs/Mono.Android/en/Java.Security/KeyStoreSpi.xml
+++ b/docs/Mono.Android/en/Java.Security/KeyStoreSpi.xml
@@ -634,11 +634,6 @@
       <Docs>
         <param name="param">the <c>LoadStoreParameter</c> that specifies how to load this
             <c>KeyStoreSpi</c>, maybe <c>null</c>.</param>
-        <param name="stream">the input stream from which the keystore is loaded,
-            or <c>null</c></param>
-        <param name="password">the password used to check the integrity of
-            the keystore, the password used to unlock the keystore,
-            or <c>null</c></param>
         <summary>Loads the keystore from the given input stream.</summary>
         <remarks>
           <para>
@@ -832,17 +827,16 @@
       </Parameters>
       <Docs>
         <param name="alias">the alias name</param>
-        <param name="key">the key to be associated with the alias</param>
-        <param name="password">the password to protect the key</param>
+        <param name="key">the key (in protected format) to be associated with the alias</param>
         <param name="chain">the certificate chain for the corresponding public
-            key (only required if the given key is of type
+            key (only useful if the protected key is of type
             <c>java.security.PrivateKey</c>).</param>
-        <summary>Assigns the given key to the given alias, protecting it with the given
-            password.</summary>
+        <summary>Assigns the given key (that has already been protected) to the given
+            alias.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/KeyStoreSpi#engineSetKeyEntry(java.lang.String,%20java.security.Key,%20char[],%20java.security.cert.Certificate[])" title="Reference documentation">Java documentation for <code>java.security.KeyStoreSpi.engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/KeyStoreSpi#engineSetKeyEntry(java.lang.String,%20byte[],%20java.security.cert.Certificate[])" title="Reference documentation">Java documentation for <code>java.security.KeyStoreSpi.engineSetKeyEntry(java.lang.String, byte[], java.security.cert.Certificate[])</code>.</a>
             </format>
           </para>
           <para>
@@ -975,8 +969,6 @@
       <Docs>
         <param name="param">the <c>LoadStoreParameter</c> that specifies how to store
             this <c>KeyStoreSpi</c>, maybe <c>null</c>.</param>
-        <param name="stream">the output stream to which this keystore is written.</param>
-        <param name="password">the password to generate the keystore integrity check</param>
         <summary>Stores this keystore to the given output stream, and protects its
             integrity with the given password.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Java.Security/MessageDigest.xml b/docs/Mono.Android/en/Java.Security/MessageDigest.xml
index 808595575d..97004ea254 100644
--- a/docs/Mono.Android/en/Java.Security/MessageDigest.xml
+++ b/docs/Mono.Android/en/Java.Security/MessageDigest.xml
@@ -200,14 +200,15 @@
         <Parameter Name="input" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="input">the <c>byte</c> array</param>
-        <summary>Completes the hash computation by performing final operations
-            such as padding.</summary>
+        <param name="input">the input to be updated before the digest is
+            completed.</param>
+        <summary>Performs a final update on the digest using the specified array
+            of bytes, then completes the digest computation.</summary>
         <returns>the array of bytes for the resulting hash value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigest#digest()" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.digest()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigest#digest(byte[])" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.digest(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -245,16 +246,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="buf">the buffer to store the result</param>
-        <param name="offset">the index of the first byte in <c>buf</c> to store</param>
-        <param name="len">the number of bytes allocated for the digest</param>
+        <param name="buf">output buffer for the computed digest</param>
+        <param name="offset">offset into the output buffer to begin storing the digest</param>
+        <param name="len">number of bytes within buf allotted for the digest</param>
         <summary>Completes the hash computation by performing final operations
             such as padding.</summary>
-        <returns>the array of bytes for the resulting hash value.</returns>
+        <returns>the number of bytes placed into <c>buf</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigest#digest()" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.digest()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigest#digest(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.digest(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -381,19 +382,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider</param>
         <param name="algorithm">the name of the algorithm requested.
             See the MessageDigest section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#MessageDigest"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a MessageDigest object that implements the specified digest
             algorithm.</summary>
-        <returns>a Message Digest object that implements the specified algorithm.</returns>
+        <returns>a MessageDigest object that implements the specified algorithm.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigest#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigest#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -432,19 +433,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider</param>
         <param name="algorithm">the name of the algorithm requested.
             See the MessageDigest section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#MessageDigest"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a MessageDigest object that implements the specified digest
             algorithm.</summary>
-        <returns>a Message Digest object that implements the specified algorithm.</returns>
+        <returns>a MessageDigest object that implements the specified algorithm.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigest#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigest#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -693,12 +694,12 @@
         <Parameter Name="input" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="input">the byte with which to update the digest.</param>
-        <summary>Updates the digest using the specified byte.</summary>
+        <param name="input">the ByteBuffer</param>
+        <summary>Update the digest using the specified ByteBuffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigest#update(byte)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigest#update(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.update(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -733,12 +734,12 @@
         <Parameter Name="input" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="input">the byte with which to update the digest.</param>
-        <summary>Updates the digest using the specified byte.</summary>
+        <param name="input">the array of bytes.</param>
+        <summary>Updates the digest using the specified array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigest#update(byte)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigest#update(byte[])" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.update(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -817,14 +818,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the index of the first byte in <c>input</c> to update from</param>
-        <param name="len">the number of bytes in <c>input</c> to update from</param>
-        <param name="input">the byte with which to update the digest.</param>
-        <summary>Updates the digest using the specified byte.</summary>
+        <param name="input">the array of bytes.</param>
+        <param name="offset">the offset to start from in the array of bytes.</param>
+        <param name="len">the number of bytes to use, starting at
+            <c>offset</c>.</param>
+        <summary>Updates the digest using the specified array of bytes, starting
+            at the specified offset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigest#update(byte)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigest#update(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.MessageDigest.update(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/MessageDigestSpi.xml b/docs/Mono.Android/en/Java.Security/MessageDigestSpi.xml
index 2eb7c2aa16..15542e95f7 100644
--- a/docs/Mono.Android/en/Java.Security/MessageDigestSpi.xml
+++ b/docs/Mono.Android/en/Java.Security/MessageDigestSpi.xml
@@ -188,16 +188,22 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="buf">the buffer to store the result in.</param>
-        <param name="offset">the index of the first byte in <c>buf</c> to store in.</param>
-        <param name="len">the number of bytes allocated for the digest.</param>
+        <param name="buf">the output buffer in which to store the digest</param>
+        <param name="offset">offset to start from in the output buffer</param>
+        <param name="len">number of bytes within buf allotted for the digest.
+            Both this default implementation and the SUN provider do not
+            return partial digests.  The presence of this parameter is solely
+            for consistency in our API's.  If the value of this parameter is less
+            than the actual digest length, the method will throw a DigestException.
+            This parameter is ignored if its value is greater than or equal to
+            the actual digest length.</param>
         <summary>Completes the hash computation by performing final
             operations such as padding.</summary>
-        <returns>the array of bytes for the resulting hash value.</returns>
+        <returns>the length of the digest stored in the output buffer.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigestSpi#engineDigest()" title="Reference documentation">Java documentation for <code>java.security.MessageDigestSpi.engineDigest()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigestSpi#engineDigest(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.MessageDigestSpi.engineDigest(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -311,12 +317,12 @@
         <Parameter Name="input" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="input">the byte to use for the update.</param>
-        <summary>Updates the digest using the specified byte.</summary>
+        <param name="input">the ByteBuffer</param>
+        <summary>Update the digest using the specified ByteBuffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigestSpi#engineUpdate(byte)" title="Reference documentation">Java documentation for <code>java.security.MessageDigestSpi.engineUpdate(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigestSpi#engineUpdate(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.security.MessageDigestSpi.engineUpdate(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -394,14 +400,16 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the index of the first byte in <c>input</c> to update from.</param>
-        <param name="len">the number of bytes in <c>input</c> to update from.</param>
-        <param name="input">the byte to use for the update.</param>
-        <summary>Updates the digest using the specified byte.</summary>
+        <param name="input">the array of bytes to use for the update.</param>
+        <param name="offset">the offset to start from in the array of bytes.</param>
+        <param name="len">the number of bytes to use, starting at
+            <c>offset</c>.</param>
+        <summary>Updates the digest using the specified array of bytes,
+            starting at the specified offset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/MessageDigestSpi#engineUpdate(byte)" title="Reference documentation">Java documentation for <code>java.security.MessageDigestSpi.engineUpdate(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/MessageDigestSpi#engineUpdate(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.MessageDigestSpi.engineUpdate(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/NoSuchAlgorithmException.xml b/docs/Mono.Android/en/Java.Security/NoSuchAlgorithmException.xml
index 14950f8208..26cf3b9381 100644
--- a/docs/Mono.Android/en/Java.Security/NoSuchAlgorithmException.xml
+++ b/docs/Mono.Android/en/Java.Security/NoSuchAlgorithmException.xml
@@ -89,13 +89,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a NoSuchAlgorithmException with no detail
-            message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>NoSuchAlgorithmException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/NoSuchAlgorithmException#NoSuchAlgorithmException()" title="Reference documentation">Java documentation for <code>java.security.NoSuchAlgorithmException.NoSuchAlgorithmException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/NoSuchAlgorithmException#NoSuchAlgorithmException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.NoSuchAlgorithmException.NoSuchAlgorithmException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +131,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a NoSuchAlgorithmException with no detail
-            message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a NoSuchAlgorithmException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/NoSuchAlgorithmException#NoSuchAlgorithmException()" title="Reference documentation">Java documentation for <code>java.security.NoSuchAlgorithmException.NoSuchAlgorithmException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/NoSuchAlgorithmException#NoSuchAlgorithmException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.NoSuchAlgorithmException.NoSuchAlgorithmException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,14 +193,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a NoSuchAlgorithmException with no detail
-            message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>NoSuchAlgorithmException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/NoSuchAlgorithmException#NoSuchAlgorithmException()" title="Reference documentation">Java documentation for <code>java.security.NoSuchAlgorithmException.NoSuchAlgorithmException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/NoSuchAlgorithmException#NoSuchAlgorithmException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.NoSuchAlgorithmException.NoSuchAlgorithmException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/NoSuchProviderException.xml b/docs/Mono.Android/en/Java.Security/NoSuchProviderException.xml
index 3fcdf8e8f9..f08394af23 100644
--- a/docs/Mono.Android/en/Java.Security/NoSuchProviderException.xml
+++ b/docs/Mono.Android/en/Java.Security/NoSuchProviderException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a NoSuchProviderException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a NoSuchProviderException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/NoSuchProviderException#NoSuchProviderException()" title="Reference documentation">Java documentation for <code>java.security.NoSuchProviderException.NoSuchProviderException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/NoSuchProviderException#NoSuchProviderException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.NoSuchProviderException.NoSuchProviderException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/PKCS12Attribute.xml b/docs/Mono.Android/en/Java.Security/PKCS12Attribute.xml
index 73a9a99257..8081f5c57c 100644
--- a/docs/Mono.Android/en/Java.Security/PKCS12Attribute.xml
+++ b/docs/Mono.Android/en/Java.Security/PKCS12Attribute.xml
@@ -66,14 +66,13 @@
         <Parameter Name="encoded" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="encoded">To be added.</param>
-        <param name="name">the attribute's identifier</param>
-        <param name="value">the attribute's value</param>
-        <summary>Constructs a PKCS12 attribute from its name and value.</summary>
+        <param name="encoded">the attribute's ASN.1 DER encoding. It is cloned
+                to prevent subsequent modificaion.</param>
+        <summary>Constructs a PKCS12 attribute from its ASN.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/PKCS12Attribute#PKCS12Attribute(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.PKCS12Attribute.PKCS12Attribute(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/PKCS12Attribute#PKCS12Attribute(byte[])" title="Reference documentation">Java documentation for <code>java.security.PKCS12Attribute.PKCS12Attribute(byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/PolicySpi.xml b/docs/Mono.Android/en/Java.Security/PolicySpi.xml
index 1cfc35952b..93e196399f 100644
--- a/docs/Mono.Android/en/Java.Security/PolicySpi.xml
+++ b/docs/Mono.Android/en/Java.Security/PolicySpi.xml
@@ -154,14 +154,11 @@
         <Parameter Name="domain" Type="Java.Security.ProtectionDomain" />
       </Parameters>
       <Docs>
-        <param name="domain">-
-            the ProtectionDomain to which the returned
-            PermissionCollection has been granted.</param>
-        <param name="codesource">the CodeSource to which the returned
+        <param name="domain">the ProtectionDomain to which the returned
                      PermissionCollection has been granted.</param>
         <summary>Return a PermissionCollection object containing the set of
-            permissions granted to the specified CodeSource.</summary>
-        <returns>a set of permissions granted to the specified CodeSource.
+            permissions granted to the specified ProtectionDomain.</summary>
+        <returns>a set of permissions granted to the specified ProtectionDomain.
                      If this operation is supported, the returned
                      set of permissions must be a new mutable instance
                      and it must support heterogeneous Permission types.
@@ -170,7 +167,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/PolicySpi#engineGetPermissions(java.security.CodeSource)" title="Reference documentation">Java documentation for <code>java.security.PolicySpi.engineGetPermissions(java.security.CodeSource)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/PolicySpi#engineGetPermissions(java.security.ProtectionDomain)" title="Reference documentation">Java documentation for <code>java.security.PolicySpi.engineGetPermissions(java.security.ProtectionDomain)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/Provider.xml b/docs/Mono.Android/en/Java.Security/Provider.xml
index c58c778de1..1b443239b1 100644
--- a/docs/Mono.Android/en/Java.Security/Provider.xml
+++ b/docs/Mono.Android/en/Java.Security/Provider.xml
@@ -792,13 +792,13 @@
         <param name="key">To be added.</param>
         <param name="oldValue">To be added.</param>
         <param name="newValue">To be added.</param>
-        <summary>Replaces the entry for the specified key only if it is
-            currently mapped to some value.</summary>
+        <summary>Replaces the entry for the specified key only if currently
+            mapped to the specified value.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Provider#replace(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.security.Provider.replace(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Provider#replace(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.security.Provider.replace(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/ProviderException.xml b/docs/Mono.Android/en/Java.Security/ProviderException.xml
index 9e9797ca28..f795115bb2 100644
--- a/docs/Mono.Android/en/Java.Security/ProviderException.xml
+++ b/docs/Mono.Android/en/Java.Security/ProviderException.xml
@@ -90,12 +90,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a ProviderException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>ProviderException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/ProviderException#ProviderException()" title="Reference documentation">Java documentation for <code>java.security.ProviderException.ProviderException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/ProviderException#ProviderException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.ProviderException.ProviderException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,12 +132,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a ProviderException with no detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a ProviderException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/ProviderException#ProviderException()" title="Reference documentation">Java documentation for <code>java.security.ProviderException.ProviderException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/ProviderException#ProviderException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.ProviderException.ProviderException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,13 +194,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a ProviderException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>ProviderException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/ProviderException#ProviderException()" title="Reference documentation">Java documentation for <code>java.security.ProviderException.ProviderException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/ProviderException#ProviderException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.ProviderException.ProviderException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/SecureClassLoader.xml b/docs/Mono.Android/en/Java.Security/SecureClassLoader.xml
index bf65106ffe..9667f04b1f 100644
--- a/docs/Mono.Android/en/Java.Security/SecureClassLoader.xml
+++ b/docs/Mono.Android/en/Java.Security/SecureClassLoader.xml
@@ -90,13 +90,13 @@
         <Parameter Name="parent" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
-        <summary>Creates a new SecureClassLoader using the default parent class
-            loader for delegation.</summary>
+        <param name="parent">the parent ClassLoader</param>
+        <summary>Creates a new SecureClassLoader using the specified parent
+            class loader for delegation.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SecureClassLoader#SecureClassLoader()" title="Reference documentation">Java documentation for <code>java.security.SecureClassLoader.SecureClassLoader()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SecureClassLoader#SecureClassLoader(java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.security.SecureClassLoader.SecureClassLoader(java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -215,24 +215,24 @@
         <Parameter Name="cs" Type="Java.Security.CodeSource" />
       </Parameters>
       <Docs>
-        <param name="off">the start offset in b of the class data.</param>
-        <param name="len">the length of the class data.</param>
         <param name="name">the expected name of the class, or <c>null</c>
                              if not known, using '.' and not '/' as the separator
                              and without a trailing ".class" suffix.</param>
-        <param name="b">the bytes that make up the class data.  The bytes from positions
-                             <c>b.position()</c> through <c>b.position() + b.limit() -1</c>
-                             should have the format of a valid class file as defined by
-                             &lt;cite&gt;The Java&amp;trade; Virtual Machine Specification&lt;/cite&gt;.</param>
+        <param name="b">the bytes that make up the class data. The bytes in
+                        positions <c>off</c> through <c>off+len-1</c>
+                        should have the format of a valid class file as defined by
+                        &lt;cite&gt;The Java&amp;trade; Virtual Machine Specification&lt;/cite&gt;.</param>
+        <param name="off">the start offset in <c>b</c> of the class data</param>
+        <param name="len">the length of the class data</param>
         <param name="cs">the associated CodeSource, or <c>null</c> if none</param>
-        <summary>Converts a <c>java.nio.ByteBuffer ByteBuffer</c>
-            into an instance of class <c>Class</c>, with an optional CodeSource.</summary>
+        <summary>Converts an array of bytes into an instance of class Class,
+            with an optional CodeSource.</summary>
         <returns>the <c>Class</c> object created from the data,
                     and optional CodeSource.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SecureClassLoader#defineClass(java.lang.String,%20java.nio.ByteBuffer,%20java.security.CodeSource)" title="Reference documentation">Java documentation for <code>java.security.SecureClassLoader.defineClass(java.lang.String, java.nio.ByteBuffer, java.security.CodeSource)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SecureClassLoader#defineClass(java.lang.String,%20byte[],%20int,%20int,%20java.security.CodeSource)" title="Reference documentation">Java documentation for <code>java.security.SecureClassLoader.defineClass(java.lang.String, byte[], int, int, java.security.CodeSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/SecureRandom.xml b/docs/Mono.Android/en/Java.Security/SecureRandom.xml
index 7248fbe614..f241af8012 100644
--- a/docs/Mono.Android/en/Java.Security/SecureRandom.xml
+++ b/docs/Mono.Android/en/Java.Security/SecureRandom.xml
@@ -89,13 +89,13 @@
         <Parameter Name="seed" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="seed">To be added.</param>
+        <param name="seed">the seed.</param>
         <summary>Constructs a secure random number generator (RNG) implementing the
             default random number algorithm.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SecureRandom#SecureRandom()" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.SecureRandom()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SecureRandom#SecureRandom(byte[])" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.SecureRandom(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -128,14 +128,13 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="secureRandomSpi">To be added.</param>
-        <param name="provider">To be added.</param>
-        <summary>Constructs a secure random number generator (RNG) implementing the
-            default random number algorithm.</summary>
+        <param name="secureRandomSpi">the SecureRandom implementation.</param>
+        <param name="provider">the provider.</param>
+        <summary>Creates a SecureRandom object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SecureRandom#SecureRandom()" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.SecureRandom()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SecureRandom#SecureRandom(java.security.SecureRandomSpi,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.SecureRandom(java.security.SecureRandomSpi, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -324,19 +323,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the security provider.</param>
         <param name="algorithm">the name of the RNG algorithm.
             See the SecureRandom section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SecureRandom"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard RNG algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a SecureRandom object that implements the specified
             Random Number Generator (RNG) algorithm.</summary>
         <returns>the new SecureRandom object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SecureRandom#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SecureRandom#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -375,19 +374,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider.</param>
         <param name="algorithm">the name of the RNG algorithm.
             See the SecureRandom section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SecureRandom"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard RNG algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a SecureRandom object that implements the specified
             Random Number Generator (RNG) algorithm.</summary>
         <returns>the new SecureRandom object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SecureRandom#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SecureRandom#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -617,12 +616,11 @@
       </Parameters>
       <Docs>
         <param name="seed">the seed.</param>
-        <summary>Reseeds this random object, using the eight bytes contained
-            in the given <c>long seed</c>.</summary>
+        <summary>Reseeds this random object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SecureRandom#setSeed(long)" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.setSeed(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SecureRandom#setSeed(byte[])" title="Reference documentation">Java documentation for <code>java.security.SecureRandom.setSeed(byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/Security.xml b/docs/Mono.Android/en/Java.Security/Security.xml
index 1f9548805e..82519aa9f0 100644
--- a/docs/Mono.Android/en/Java.Security/Security.xml
+++ b/docs/Mono.Android/en/Java.Security/Security.xml
@@ -316,13 +316,17 @@
         <Parameter Name="filter" Type="System.Collections.Generic.IDictionary&lt;System.String,System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="filter">To be added.</param>
-        <summary>Returns an array containing all the installed providers.</summary>
-        <returns>an array of all the installed providers.</returns>
+        <param name="filter">the criteria for selecting
+            providers. The filter is case-insensitive.</param>
+        <summary>Returns an array containing all installed providers that satisfy the
+            specified* selection criteria, or null if no such providers have been
+            installed.</summary>
+        <returns>all the installed providers that satisfy the selection
+            criteria, or null if no such providers have been installed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Security#getProviders()" title="Reference documentation">Java documentation for <code>java.security.Security.getProviders()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Security#getProviders(java.util.Map)" title="Reference documentation">Java documentation for <code>java.security.Security.getProviders(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -356,13 +360,17 @@
         <Parameter Name="filter" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="filter">case-insensitive filter.</param>
-        <summary>Returns an array containing all the installed providers.</summary>
-        <returns>an array of all the installed providers.</returns>
+        <param name="filter">the criterion for selecting
+            providers. The filter is case-insensitive.</param>
+        <summary>Returns an array containing all installed providers that satisfy the
+            specified selection criterion, or null if no such providers have been
+            installed.</summary>
+        <returns>all the installed providers that satisfy the selection
+            criterion, or null if no such providers have been installed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Security#getProviders()" title="Reference documentation">Java documentation for <code>java.security.Security.getProviders()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Security#getProviders(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.Security.getProviders(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/Signature.xml b/docs/Mono.Android/en/Java.Security/Signature.xml
index 362cb89209..16a1e3b0c4 100644
--- a/docs/Mono.Android/en/Java.Security/Signature.xml
+++ b/docs/Mono.Android/en/Java.Security/Signature.xml
@@ -209,19 +209,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the security provider.</param>
-        <param name="algorithm">the standard name of the algorithm requested.
+        <param name="algorithm">the name of the algorithm requested.
             See the Signature section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Signature"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
-        <summary>Returns a Signature object that implements the specified signature
-            algorithm.</summary>
+        <param name="provider">the provider.</param>
+        <summary>Returns a Signature object that implements the specified
+            signature algorithm.</summary>
         <returns>the new Signature object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.Signature.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>java.security.Signature.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -260,19 +260,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider.</param>
-        <param name="algorithm">the standard name of the algorithm requested.
+        <param name="algorithm">the name of the algorithm requested.
             See the Signature section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Signature"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a Signature object that implements the specified signature
             algorithm.</summary>
         <returns>the new Signature object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.Signature.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.Signature.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -402,14 +402,14 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="random">the <c>SecureRandom</c> to use.</param>
         <param name="privateKey">the private key of the identity whose signature
             is going to be generated.</param>
+        <param name="random">the source of randomness for this signature.</param>
         <summary>Initialize this object for signing.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#initSign(java.security.PrivateKey)" title="Reference documentation">Java documentation for <code>java.security.Signature.initSign(java.security.PrivateKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#initSign(java.security.PrivateKey,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.Signature.initSign(java.security.PrivateKey, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -446,14 +446,14 @@
         <Parameter Name="certificate" Type="Java.Security.Cert.Certificate" />
       </Parameters>
       <Docs>
-        <param name="certificate">the certificate used to verify a signature.</param>
-        <param name="publicKey">the public key of the identity whose signature is
+        <param name="certificate">the certificate of the identity whose signature is
             going to be verified.</param>
-        <summary>Initializes this object for verification.</summary>
+        <summary>Initializes this object for verification, using the public key from
+            the given certificate.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#initVerify(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>java.security.Signature.initVerify(java.security.PublicKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#initVerify(java.security.cert.Certificate)" title="Reference documentation">Java documentation for <code>java.security.Signature.initVerify(java.security.cert.Certificate)</code>.</a>
             </format>
           </para>
           <para>
@@ -640,14 +640,12 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">the parameter to set.</param>
-        <param name="param">the string identifier of the parameter.</param>
-        <param name="value">the parameter value.</param>
-        <summary>Sets the specified algorithm parameter to the specified value.</summary>
+        <param name="params">the parameters</param>
+        <summary>Initializes this signature engine with the specified parameter set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#setParameter(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.security.Signature.setParameter(java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#setParameter(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.Signature.setParameter(java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
@@ -776,15 +774,19 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="outbuf">the buffer to store the signature.</param>
-        <param name="offset">the index of the first byte in <c>outbuf</c> to store.</param>
-        <param name="len">the number of bytes allocated for the signature.</param>
-        <summary>Returns the signature bytes of all the data updated.</summary>
-        <returns>the signature bytes of the signing operation's result.</returns>
+        <param name="outbuf">buffer for the signature result.</param>
+        <param name="offset">offset into <c>outbuf</c> where the signature is
+            stored.</param>
+        <param name="len">number of bytes within <c>outbuf</c> allotted for the
+            signature.</param>
+        <summary>Finishes the signature operation and stores the resulting signature
+            bytes in the provided buffer <c>outbuf</c>, starting at
+            <c>offset</c>.</summary>
+        <returns>the number of bytes placed into <c>outbuf</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#sign()" title="Reference documentation">Java documentation for <code>java.security.Signature.sign()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#sign(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.Signature.sign(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -965,13 +967,13 @@
         <Parameter Name="data" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="data">the <c>ByteBuffer</c> to update with.</param>
-        <param name="b">the byte to use for the update.</param>
-        <summary>Updates the data to be signed or verified by a byte.</summary>
+        <param name="data">the ByteBuffer</param>
+        <summary>Updates the data to be signed or verified using the specified
+            ByteBuffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#update(byte)" title="Reference documentation">Java documentation for <code>java.security.Signature.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#update(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.security.Signature.update(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1009,13 +1011,13 @@
         <Parameter Name="data" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="data">the byte array to update with.</param>
-        <param name="b">the byte to use for the update.</param>
-        <summary>Updates the data to be signed or verified by a byte.</summary>
+        <param name="data">the byte array to use for the update.</param>
+        <summary>Updates the data to be signed or verified, using the specified
+            array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#update(byte)" title="Reference documentation">Java documentation for <code>java.security.Signature.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#update(byte[])" title="Reference documentation">Java documentation for <code>java.security.Signature.update(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1098,15 +1100,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="data">the byte array to update with.</param>
-        <param name="off">the start index in <c>data</c> of the data.</param>
-        <param name="len">the number of bytes to use.</param>
-        <param name="b">the byte to use for the update.</param>
-        <summary>Updates the data to be signed or verified by a byte.</summary>
+        <param name="data">the array of bytes.</param>
+        <param name="off">the offset to start from in the array of bytes.</param>
+        <param name="len">the number of bytes to use, starting at offset.</param>
+        <summary>Updates the data to be signed or verified, using the specified
+            array of bytes, starting at the specified offset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#update(byte)" title="Reference documentation">Java documentation for <code>java.security.Signature.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#update(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.Signature.update(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1190,15 +1192,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the start index in <c>signature</c> of the signature.</param>
-        <param name="length">the number of bytes allocated for the signature.</param>
         <param name="signature">the signature bytes to be verified.</param>
-        <summary>Verifies the passed-in signature.</summary>
+        <param name="offset">the offset to start from in the array of bytes.</param>
+        <param name="length">the number of bytes to use, starting at offset.</param>
+        <summary>Verifies the passed-in signature in the specified array
+            of bytes, starting at the specified offset.</summary>
         <returns>true if the signature was verified, false if not.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signature#verify(byte[])" title="Reference documentation">Java documentation for <code>java.security.Signature.verify(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signature#verify(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.Signature.verify(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/SignatureException.xml b/docs/Mono.Android/en/Java.Security/SignatureException.xml
index 3bb04aa377..ef23235580 100644
--- a/docs/Mono.Android/en/Java.Security/SignatureException.xml
+++ b/docs/Mono.Android/en/Java.Security/SignatureException.xml
@@ -87,12 +87,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a SignatureException with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>SignatureException</c> with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureException#SignatureException()" title="Reference documentation">Java documentation for <code>java.security.SignatureException.SignatureException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureException#SignatureException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.SignatureException.SignatureException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +129,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a SignatureException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a SignatureException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureException#SignatureException()" title="Reference documentation">Java documentation for <code>java.security.SignatureException.SignatureException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureException#SignatureException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.SignatureException.SignatureException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +191,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a SignatureException with no detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                   by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                   <c>#getCause()</c> method).  (A <c>null</c> value is permitted,
+                   and indicates that the cause is nonexistent or unknown.)</param>
+        <summary>Creates a <c>SignatureException</c> with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureException#SignatureException()" title="Reference documentation">Java documentation for <code>java.security.SignatureException.SignatureException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureException#SignatureException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.security.SignatureException.SignatureException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/SignatureSpi.xml b/docs/Mono.Android/en/Java.Security/SignatureSpi.xml
index 9ca1df7099..b75b11c886 100644
--- a/docs/Mono.Android/en/Java.Security/SignatureSpi.xml
+++ b/docs/Mono.Android/en/Java.Security/SignatureSpi.xml
@@ -312,15 +312,15 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="random">the <c>SecureRandom</c> to use.</param>
         <param name="privateKey">the private key of the identity whose signature
             will be generated.</param>
+        <param name="random">the source of randomness</param>
         <summary>Initializes this signature object with the specified
-            private key for signing operations.</summary>
+            private key and source of randomness for signing operations.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineInitSign(java.security.PrivateKey)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineInitSign(java.security.PrivateKey)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineInitSign(java.security.PrivateKey,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineInitSign(java.security.PrivateKey, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -401,15 +401,13 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">the parameter to set.</param>
-        <param name="param">the string identifier of the parameter.</param>
-        <param name="value">the parameter value.</param>
-        <summary>Sets the specified algorithm parameter to the specified
-            value.</summary>
+        <param name="params">the parameters</param>
+        <summary>This method is overridden by providers to initialize
+            this signature engine with the specified parameter set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineSetParameter(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineSetParameter(java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineSetParameter(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineSetParameter(java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
@@ -536,16 +534,25 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="outbuf">the buffer to store the signature.</param>
-        <param name="offset">the index of the first byte in <c>outbuf</c> to store.</param>
-        <param name="len">the number of bytes allocated for the signature.</param>
-        <summary>Returns the signature bytes of all the data
-            updated so far.</summary>
-        <returns>the signature bytes of the signing operation's result.</returns>
+        <param name="outbuf">buffer for the signature result.</param>
+        <param name="offset">offset into <c>outbuf</c> where the signature is
+            stored.</param>
+        <param name="len">number of bytes within <c>outbuf</c> allotted for the
+            signature.
+            Both this default implementation and the SUN provider do not
+            return partial digests. If the value of this parameter is less
+            than the actual signature length, this method will throw a
+            SignatureException.
+            This parameter is ignored if its value is greater than or equal to
+            the actual signature length.</param>
+        <summary>Finishes this signature operation and stores the resulting signature
+            bytes in the provided buffer <c>outbuf</c>, starting at
+            <c>offset</c>.</summary>
+        <returns>the number of bytes placed into <c>outbuf</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineSign()" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineSign()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineSign(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineSign(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -585,14 +592,13 @@
         <Parameter Name="input" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="input">the <c>ByteBuffer</c> to update with.</param>
-        <param name="b">the byte to use for the update.</param>
-        <summary>Updates the data to be signed or verified
-            using the specified byte.</summary>
+        <param name="input">the ByteBuffer</param>
+        <summary>Updates the data to be signed or verified using the specified
+            ByteBuffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineUpdate(byte)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineUpdate(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineUpdate(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineUpdate(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -677,15 +683,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">the start index in <c>b</c> of the data.</param>
-        <param name="len">the number of bytes to use.</param>
-        <param name="b">the byte to use for the update.</param>
-        <summary>Updates the data to be signed or verified
-            using the specified byte.</summary>
+        <param name="b">the array of bytes</param>
+        <param name="off">the offset to start from in the array of bytes</param>
+        <param name="len">the number of bytes to use, starting at offset</param>
+        <summary>Updates the data to be signed or verified, using the
+            specified array of bytes, starting at the specified offset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineUpdate(byte)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineUpdate(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineUpdate(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineUpdate(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -769,15 +775,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the start index in <c>sigBytes</c> of the signature</param>
-        <param name="length">the number of bytes allocated for the signature.</param>
         <param name="sigBytes">the signature bytes to be verified.</param>
-        <summary>Verifies the passed-in signature.</summary>
+        <param name="offset">the offset to start from in the array of bytes.</param>
+        <param name="length">the number of bytes to use, starting at offset.</param>
+        <summary>Verifies the passed-in signature in the specified array
+            of bytes, starting at the specified offset.</summary>
         <returns>true if the signature was verified, false if not.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineVerify(byte[])" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineVerify(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/SignatureSpi#engineVerify(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.security.SignatureSpi.engineVerify(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/Signer.xml b/docs/Mono.Android/en/Java.Security/Signer.xml
index 27863ad34a..3a70474605 100644
--- a/docs/Mono.Android/en/Java.Security/Signer.xml
+++ b/docs/Mono.Android/en/Java.Security/Signer.xml
@@ -100,12 +100,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Creates a signer.</summary>
+        <param name="name">the identity name.</param>
+        <summary>Creates a signer with the specified identity name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signer#Signer()" title="Reference documentation">Java documentation for <code>java.security.Signer.Signer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signer#Signer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.Signer.Signer(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -165,13 +165,13 @@
         <Parameter Name="scope" Type="Java.Security.IdentityScope" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="scope">To be added.</param>
-        <summary>Creates a signer.</summary>
+        <param name="name">the identity name.</param>
+        <param name="scope">the scope of the identity.</param>
+        <summary>Creates a signer with the specified identity name and scope.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/Signer#Signer()" title="Reference documentation">Java documentation for <code>java.security.Signer.Signer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/Signer#Signer(java.lang.String,%20java.security.IdentityScope)" title="Reference documentation">Java documentation for <code>java.security.Signer.Signer(java.lang.String, java.security.IdentityScope)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/UnrecoverableEntryException.xml b/docs/Mono.Android/en/Java.Security/UnrecoverableEntryException.xml
index b5fbd442c0..54a18646a3 100644
--- a/docs/Mono.Android/en/Java.Security/UnrecoverableEntryException.xml
+++ b/docs/Mono.Android/en/Java.Security/UnrecoverableEntryException.xml
@@ -87,12 +87,14 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an UnrecoverableEntryException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an UnrecoverableEntryException with the specified detail
+            message, which provides more information about why this exception
+            has been thrown.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/UnrecoverableEntryException#UnrecoverableEntryException()" title="Reference documentation">Java documentation for <code>java.security.UnrecoverableEntryException.UnrecoverableEntryException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/UnrecoverableEntryException#UnrecoverableEntryException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.UnrecoverableEntryException.UnrecoverableEntryException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Security/UnrecoverableKeyException.xml b/docs/Mono.Android/en/Java.Security/UnrecoverableKeyException.xml
index a9c9b4c083..d0fab98273 100644
--- a/docs/Mono.Android/en/Java.Security/UnrecoverableKeyException.xml
+++ b/docs/Mono.Android/en/Java.Security/UnrecoverableKeyException.xml
@@ -87,12 +87,14 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an UnrecoverableKeyException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an UnrecoverableKeyException with the specified detail
+            message, which provides more information about why this exception
+            has been thrown.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/security/UnrecoverableKeyException#UnrecoverableKeyException()" title="Reference documentation">Java documentation for <code>java.security.UnrecoverableKeyException.UnrecoverableKeyException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/security/UnrecoverableKeyException#UnrecoverableKeyException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.security.UnrecoverableKeyException.UnrecoverableKeyException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml b/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml
index 08378182a8..65397616c1 100644
--- a/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml
+++ b/docs/Mono.Android/en/Java.Sql/BatchUpdateException.xml
@@ -101,12 +101,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
+            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
+             a given &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,12 +141,20 @@
         <Parameter Name="updateCounts" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="updateCounts">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
+            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(int[])" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -176,13 +187,23 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="updateCounts">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
+            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+            the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a
+            given &lt;code&gt;cause&lt;/code&gt; and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(int[],%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(int[], java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -238,13 +259,21 @@
         <Parameter Name="updateCounts" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="updateCounts">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
+            &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -278,14 +307,25 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="updateCounts">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating
+            the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
+            a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;cause&lt;/code&gt;
+            and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(java.lang.String,%20int[],%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(java.lang.String, int[], java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -319,14 +359,23 @@
         <Parameter Name="updateCounts" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="updateCounts">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and
+            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(java.lang.String,%20java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(java.lang.String, java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -361,15 +410,25 @@
         <Parameter Name="updateCounts" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="updateCounts">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the error</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">an exception code used by a particular
+            database vendor</param>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt; and
+            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(java.lang.String,%20java.lang.String,%20int,%20int[])" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(java.lang.String, java.lang.String, int, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -404,15 +463,26 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="updateCounts">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating
+            the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
+            a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;,&lt;code&gt;cause&lt;/code&gt;, and
+            &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(java.lang.String,%20java.lang.String,%20int[],%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(java.lang.String, java.lang.String, int[], java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -448,16 +518,28 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="updateCounts">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the error</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">an exception code used by a particular
+            database vendor</param>
+        <param name="updateCounts">an array of &lt;code&gt;int&lt;/code&gt;, with each element
+            indicating the update count, &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; or
+            &lt;code&gt;Statement.EXECUTE_FAILED&lt;/code&gt; for each SQL command in
+            the batch for JDBC drivers that continue processing
+            after a command failure; an update count or
+            &lt;code&gt;Statement.SUCCESS_NO_INFO&lt;/code&gt; for each SQL command in the batch
+            prior to the failure for JDBC drivers that stop processing after a command
+            failure</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating
+            the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;BatchUpdateException&lt;/code&gt; object initialized with
+            a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            &lt;code&gt;cause&lt;/code&gt; and &lt;code&gt;updateCounts&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException()" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/BatchUpdateException#BatchUpdateException(java.lang.String,%20java.lang.String,%20int,%20int[],%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.BatchUpdateException.BatchUpdateException(java.lang.String, java.lang.String, int, int[], java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/DataTruncation.xml b/docs/Mono.Android/en/Java.Sql/DataTruncation.xml
index 9dae75af7b..3355cc14c6 100644
--- a/docs/Mono.Android/en/Java.Sql/DataTruncation.xml
+++ b/docs/Mono.Android/en/Java.Sql/DataTruncation.xml
@@ -150,12 +150,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="index">The index of the parameter or column value</param>
         <param name="parameter">true if a parameter value was truncated</param>
         <param name="read">true if a read was truncated</param>
         <param name="dataSize">the original size of the data</param>
         <param name="transferSize">the size after truncation</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;DataTruncation&lt;/code&gt;
+            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating the cause is non-existent or unknown.</param>
         <summary>Creates a &lt;code&gt;DataTruncation&lt;/code&gt; object
             with the SQLState initialized
             to 01004 when &lt;code&gt;read&lt;/code&gt; is set to &lt;code&gt;true&lt;/code&gt; and 22001
@@ -166,7 +168,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/DataTruncation#DataTruncation(int,%20boolean,%20boolean,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.DataTruncation.DataTruncation(int, boolean, boolean, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/DataTruncation#DataTruncation(int,%20boolean,%20boolean,%20int,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.DataTruncation.DataTruncation(int, boolean, boolean, int, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/Date.xml b/docs/Mono.Android/en/Java.Sql/Date.xml
index 7189eb8fce..dd1ff80d95 100644
--- a/docs/Mono.Android/en/Java.Sql/Date.xml
+++ b/docs/Mono.Android/en/Java.Sql/Date.xml
@@ -55,17 +55,16 @@
         <Parameter Name="date" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="date">To be added.</param>
-        <param name="year">the year minus 1900; must be 0 to 8099. (Note that
-                   8099 is 9999 minus 1900.)</param>
-        <param name="month">0 to 11</param>
-        <param name="day">1 to 31</param>
-        <summary>Constructs a &lt;code&gt;Date&lt;/code&gt; object initialized with the given
-            year, month, and day.</summary>
+        <param name="date">milliseconds since January 1, 1970, 00:00:00 GMT not
+                   to exceed the milliseconds representation for the year 8099.
+                   A negative number indicates the number of milliseconds
+                   before January 1, 1970, 00:00:00 GMT.</param>
+        <summary>Constructs a &lt;code&gt;Date&lt;/code&gt; object using the given milliseconds
+            time value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Date#Date(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Date.Date(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Date#Date(long)" title="Reference documentation">Java documentation for <code>java.sql.Date.Date(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/DriverManager.xml b/docs/Mono.Android/en/Java.Sql/DriverManager.xml
index c7f63d3d57..28d9c51cfb 100644
--- a/docs/Mono.Android/en/Java.Sql/DriverManager.xml
+++ b/docs/Mono.Android/en/Java.Sql/DriverManager.xml
@@ -207,19 +207,17 @@
         <Parameter Name="info" Type="Java.Util.Properties" />
       </Parameters>
       <Docs>
-        <param name="info">a set of properties to use as arguments to set up the
-            connection. Properties are arbitrary string/value pairs.
-            Normally, at least the properties <c>"user"</c> and <c>"password"</c> should be passed, with appropriate settings for
-            the user ID and its corresponding password to get access to
-            the corresponding database.</param>
         <param name="url">a database url of the form
-             &lt;code&gt; jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+            &lt;code&gt; jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+        <param name="info">a list of arbitrary string tag/value pairs as
+            connection arguments; normally at least a "user" and
+            "password" property should be included</param>
         <summary>Attempts to establish a connection to the given database URL.</summary>
-        <returns>a connection to the URL</returns>
+        <returns>a Connection to the URL</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/DriverManager#getConnection(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.DriverManager.getConnection(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/DriverManager#getConnection(java.lang.String,%20java.util.Properties)" title="Reference documentation">Java documentation for <code>java.sql.DriverManager.getConnection(java.lang.String, java.util.Properties)</code>.</a>
             </format>
           </para>
           <para>
@@ -259,16 +257,17 @@
         <Parameter Name="password" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="user">a user ID used to login to the database.</param>
-        <param name="password">a password for the user ID to login to the database.</param>
         <param name="url">a database url of the form
-             &lt;code&gt; jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+            &lt;code&gt;jdbc:&lt;em&gt;subprotocol&lt;/em&gt;:&lt;em&gt;subname&lt;/em&gt;&lt;/code&gt;</param>
+        <param name="user">the database user on whose behalf the connection is being
+              made</param>
+        <param name="password">the user's password</param>
         <summary>Attempts to establish a connection to the given database URL.</summary>
         <returns>a connection to the URL</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/DriverManager#getConnection(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.DriverManager.getConnection(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/DriverManager#getConnection(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.DriverManager.getConnection(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IArray.xml b/docs/Mono.Android/en/Java.Sql/IArray.xml
index 9f5d655632..8d4213017a 100644
--- a/docs/Mono.Android/en/Java.Sql/IArray.xml
+++ b/docs/Mono.Android/en/Java.Sql/IArray.xml
@@ -197,18 +197,16 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">To be added.</param>
-        <summary>Retrieves the contents of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value designated
-            by this
-            &lt;code&gt;Array&lt;/code&gt; object in the form of an array in the Java
-            programming language.</summary>
-        <returns>an array in the Java programming language that contains
-            the ordered elements of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value
-            designated by this &lt;code&gt;Array&lt;/code&gt; object</returns>
+        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains mappings
+                       of SQL type names to classes in the Java programming language</param>
+        <summary>Retrieves the contents of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value designated by this
+            &lt;code&gt;Array&lt;/code&gt; object.</summary>
+        <returns>an array in the Java programming language that contains the ordered
+                    elements of the SQL array designated by this object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Array#getArray()" title="Reference documentation">Java documentation for <code>java.sql.Array.getArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Array#getArray(java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.Array.getArray(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -244,20 +242,19 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the start position in the array where the values are
-            retrieved.</param>
-        <param name="count">the number of elements to retrieve.</param>
-        <summary>Retrieves the contents of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value designated
-            by this
-            &lt;code&gt;Array&lt;/code&gt; object in the form of an array in the Java
-            programming language.</summary>
-        <returns>an array in the Java programming language that contains
-            the ordered elements of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value
-            designated by this &lt;code&gt;Array&lt;/code&gt; object</returns>
+        <param name="index">the array index of the first element to retrieve;
+                         the first element is at index 1</param>
+        <param name="count">the number of successive SQL array elements to retrieve</param>
+        <summary>Retrieves a slice of the SQL &lt;code&gt;ARRAY&lt;/code&gt;
+            value designated by this &lt;code&gt;Array&lt;/code&gt; object, beginning with the
+            specified &lt;code&gt;index&lt;/code&gt; and containing up to &lt;code&gt;count&lt;/code&gt;
+            successive elements of the SQL array.</summary>
+        <returns>an array containing up to &lt;code&gt;count&lt;/code&gt; consecutive elements
+            of the SQL array, beginning with element &lt;code&gt;index&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Array#getArray()" title="Reference documentation">Java documentation for <code>java.sql.Array.getArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Array#getArray(long,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Array.getArray(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -296,20 +293,25 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <param name="count">To be added.</param>
-        <param name="map">To be added.</param>
-        <summary>Retrieves the contents of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value designated
-            by this
-            &lt;code&gt;Array&lt;/code&gt; object in the form of an array in the Java
-            programming language.</summary>
-        <returns>an array in the Java programming language that contains
-            the ordered elements of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value
-            designated by this &lt;code&gt;Array&lt;/code&gt; object</returns>
+        <param name="index">the array index of the first element to retrieve;
+                         the first element is at index 1</param>
+        <param name="count">the number of successive SQL array elements to
+            retrieve</param>
+        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object
+            that contains SQL type names and the classes in
+            the Java programming language to which they are mapped</param>
+        <summary>Retreives a slice of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value
+            designated by this &lt;code&gt;Array&lt;/code&gt; object, beginning with the specified
+            &lt;code&gt;index&lt;/code&gt; and containing up to &lt;code&gt;count&lt;/code&gt;
+            successive elements of the SQL array.</summary>
+        <returns>an array containing up to &lt;code&gt;count&lt;/code&gt;
+            consecutive elements of the SQL &lt;code&gt;ARRAY&lt;/code&gt; value designated by this
+            &lt;code&gt;Array&lt;/code&gt; object, beginning with element
+            &lt;code&gt;index&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Array#getArray()" title="Reference documentation">Java documentation for <code>java.sql.Array.getArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Array#getArray(long,%20int,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.Array.getArray(long, int, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -343,17 +345,17 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">To be added.</param>
+        <param name="map">contains the mapping of SQL user-defined types to
+            classes in the Java programming language</param>
         <summary>Retrieves a result set that contains the elements of the SQL
-            &lt;code&gt;ARRAY&lt;/code&gt; value
-            designated by this &lt;code&gt;Array&lt;/code&gt; object.</summary>
-        <returns>a <c>ResultSet</c> object containing one row for each
+            &lt;code&gt;ARRAY&lt;/code&gt; value designated by this &lt;code&gt;Array&lt;/code&gt; object.</summary>
+        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object containing one row for each
             of the elements in the array designated by this &lt;code&gt;Array&lt;/code&gt;
             object, with the rows in ascending order based on the indices.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Array#getResultSet()" title="Reference documentation">Java documentation for <code>java.sql.Array.getResultSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Array#getResultSet(java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.Array.getResultSet(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -388,19 +390,20 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">the start position in the array where the values are
-            retrieved.</param>
-        <param name="count">the number of elements to retrieve.</param>
-        <summary>Retrieves a result set that contains the elements of the SQL
-            &lt;code&gt;ARRAY&lt;/code&gt; value
-            designated by this &lt;code&gt;Array&lt;/code&gt; object.</summary>
-        <returns>a <c>ResultSet</c> object containing one row for each
-            of the elements in the array designated by this &lt;code&gt;Array&lt;/code&gt;
-            object, with the rows in ascending order based on the indices.</returns>
+        <param name="index">the array index of the first element to retrieve;
+                         the first element is at index 1</param>
+        <param name="count">the number of successive SQL array elements to retrieve</param>
+        <summary>Retrieves a result set holding the elements of the subarray that
+            starts at index &lt;code&gt;index&lt;/code&gt; and contains up to
+            &lt;code&gt;count&lt;/code&gt; successive elements.</summary>
+        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object containing up to
+            &lt;code&gt;count&lt;/code&gt; consecutive elements of the SQL array
+            designated by this &lt;code&gt;Array&lt;/code&gt; object, starting at
+            index &lt;code&gt;index&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Array#getResultSet()" title="Reference documentation">Java documentation for <code>java.sql.Array.getResultSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Array#getResultSet(long,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Array.getResultSet(long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -439,19 +442,22 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <param name="count">To be added.</param>
-        <param name="map">To be added.</param>
-        <summary>Retrieves a result set that contains the elements of the SQL
-            &lt;code&gt;ARRAY&lt;/code&gt; value
-            designated by this &lt;code&gt;Array&lt;/code&gt; object.</summary>
-        <returns>a <c>ResultSet</c> object containing one row for each
-            of the elements in the array designated by this &lt;code&gt;Array&lt;/code&gt;
-            object, with the rows in ascending order based on the indices.</returns>
+        <param name="index">the array index of the first element to retrieve;
+                         the first element is at index 1</param>
+        <param name="count">the number of successive SQL array elements to retrieve</param>
+        <param name="map">the &lt;code&gt;Map&lt;/code&gt; object that contains the mapping
+            of SQL type names to classes in the Java(tm) programming language</param>
+        <summary>Retrieves a result set holding the elements of the subarray that
+            starts at index &lt;code&gt;index&lt;/code&gt; and contains up to
+            &lt;code&gt;count&lt;/code&gt; successive elements.</summary>
+        <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object containing up to
+            &lt;code&gt;count&lt;/code&gt; consecutive elements of the SQL array
+            designated by this &lt;code&gt;Array&lt;/code&gt; object, starting at
+            index &lt;code&gt;index&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Array#getResultSet()" title="Reference documentation">Java documentation for <code>java.sql.Array.getResultSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Array#getResultSet(long,%20int,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.Array.getResultSet(long, int, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IBlob.xml b/docs/Mono.Android/en/Java.Sql/IBlob.xml
index e838aced95..3008cf2483 100644
--- a/docs/Mono.Android/en/Java.Sql/IBlob.xml
+++ b/docs/Mono.Android/en/Java.Sql/IBlob.xml
@@ -137,15 +137,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="pos">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Retrieves the &lt;code&gt;BLOB&lt;/code&gt; value designated by this
-            &lt;code&gt;Blob&lt;/code&gt; instance as a stream.</summary>
-        <returns>a stream containing the &lt;code&gt;BLOB&lt;/code&gt; data</returns>
+        <param name="pos">the offset to the first byte of the partial value to be retrieved.
+             The first byte in the &lt;code&gt;Blob&lt;/code&gt; is at position 1</param>
+        <param name="length">the length in bytes of the partial value to be retrieved</param>
+        <summary>Returns an &lt;code&gt;InputStream&lt;/code&gt; object that contains a partial &lt;code&gt;Blob&lt;/code&gt; value,
+            starting  with the byte specified by pos, which is length bytes in length.</summary>
+        <returns>&lt;code&gt;InputStream&lt;/code&gt; through which the partial &lt;code&gt;Blob&lt;/code&gt; value can be read.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Blob#getBinaryStream()" title="Reference documentation">Java documentation for <code>java.sql.Blob.getBinaryStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Blob#getBinaryStream(long,%20long)" title="Reference documentation">Java documentation for <code>java.sql.Blob.getBinaryStream(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -326,18 +327,17 @@
         <Parameter Name="start" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="pattern">the &lt;code&gt;Blob&lt;/code&gt; object designating
-            the &lt;code&gt;BLOB&lt;/code&gt; value for which to search</param>
-        <param name="start">the position in the &lt;code&gt;BLOB&lt;/code&gt; value
-                   at which to begin searching; the first position is 1</param>
-        <summary>Retrieves the byte position in the &lt;code&gt;BLOB&lt;/code&gt; value
-            designated by this &lt;code&gt;Blob&lt;/code&gt; object at which
-            &lt;code&gt;pattern&lt;/code&gt; begins.</summary>
-        <returns>the position at which the pattern begins, else -1</returns>
+        <param name="pattern">the byte array for which to search</param>
+        <param name="start">the position at which to begin searching; the
+                   first position is 1</param>
+        <summary>Retrieves the byte position at which the specified byte array
+            &lt;code&gt;pattern&lt;/code&gt; begins within the &lt;code&gt;BLOB&lt;/code&gt;
+            value that this &lt;code&gt;Blob&lt;/code&gt; object represents.</summary>
+        <returns>the position at which the pattern appears, else -1</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Blob#position(java.sql.Blob,%20long)" title="Reference documentation">Java documentation for <code>java.sql.Blob.position(java.sql.Blob, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Blob#position(byte[],%20long)" title="Reference documentation">Java documentation for <code>java.sql.Blob.position(byte[], long)</code>.</a>
             </format>
           </para>
           <para>
@@ -472,21 +472,22 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the offset into the byte array from which to start writing
-            data - the first byte in the array has offset <c>0</c>.</param>
-        <param name="len">the length of data to write in number of bytes.</param>
         <param name="pos">the position in the &lt;code&gt;BLOB&lt;/code&gt; object at which
                    to start writing; the first position is 1</param>
-        <param name="bytes">the array of bytes to be written to the &lt;code&gt;BLOB&lt;/code&gt;
-                   value that this &lt;code&gt;Blob&lt;/code&gt; object represents</param>
-        <summary>Writes the given array of bytes to the &lt;code&gt;BLOB&lt;/code&gt; value that
-            this &lt;code&gt;Blob&lt;/code&gt; object represents, starting at position
-            &lt;code&gt;pos&lt;/code&gt;, and returns the number of bytes written.</summary>
+        <param name="bytes">the array of bytes to be written to this &lt;code&gt;BLOB&lt;/code&gt;
+                   object</param>
+        <param name="offset">the offset into the array &lt;code&gt;bytes&lt;/code&gt; at which
+                   to start reading the bytes to be set</param>
+        <param name="len">the number of bytes to be written to the &lt;code&gt;BLOB&lt;/code&gt;
+                   value from the array of bytes &lt;code&gt;bytes&lt;/code&gt;</param>
+        <summary>Writes all or part of the given &lt;code&gt;byte&lt;/code&gt; array to the
+            &lt;code&gt;BLOB&lt;/code&gt; value that this &lt;code&gt;Blob&lt;/code&gt; object represents
+            and returns the number of bytes written.</summary>
         <returns>the number of bytes written</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Blob#setBytes(long,%20byte[])" title="Reference documentation">Java documentation for <code>java.sql.Blob.setBytes(long, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Blob#setBytes(long,%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Blob.setBytes(long, byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml b/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml
index b0c55a668e..cfb6b80794 100644
--- a/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml
+++ b/docs/Mono.Android/en/Java.Sql/ICallableStatement.xml
@@ -120,18 +120,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, and
-            so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;ARRAY&lt;/code&gt; parameter as an
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;ARRAY&lt;/code&gt; parameter as an
             <c>java.sql.Array</c> object in the Java programming language.</summary>
         <returns>the parameter value as an &lt;code&gt;Array&lt;/code&gt; object in
-            the Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getArray(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getArray(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getArray(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getArray(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -214,17 +212,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;NUMERIC&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;NUMERIC&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value in full precision.  If the value is
             SQL &lt;code&gt;NULL&lt;/code&gt;, the result is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBigDecimal(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBigDecimal(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBigDecimal(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBigDecimal(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -266,17 +262,17 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="scale">the number of digits after the decimal point to get.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
+                   and so on</param>
+        <param name="scale">the number of digits to the right of the decimal point</param>
         <summary>Retrieves the value of the designated JDBC &lt;code&gt;NUMERIC&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
-        <returns>the parameter value in full precision.  If the value is
-            SQL &lt;code&gt;NULL&lt;/code&gt;, the result is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
+                    is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBigDecimal(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBigDecimal(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBigDecimal(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBigDecimal(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -358,17 +354,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BLOB&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;BLOB&lt;/code&gt; parameter as a
             <c>java.sql.Blob</c> object in the Java programming language.</summary>
         <returns>the parameter value as a &lt;code&gt;Blob&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the value
-            &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBlob(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBlob(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBlob(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBlob(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -452,18 +447,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BIT&lt;/code&gt;
-            or &lt;code&gt;BOOLEAN&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;BIT&lt;/code&gt; or &lt;code&gt;BOOLEAN&lt;/code&gt;
+            parameter as a
             &lt;code&gt;boolean&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the result is &lt;code&gt;false&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
+            is &lt;code&gt;false&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBoolean(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBoolean(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBoolean(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBoolean(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -546,17 +539,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TINYINT&lt;/code&gt; parameter
-            as a &lt;code&gt;byte&lt;/code&gt; in the Java programming language.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;TINYINT&lt;/code&gt; parameter as a &lt;code&gt;byte&lt;/code&gt;
+            in the Java programming language.</summary>
         <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
             is &lt;code&gt;0&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getByte(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getByte(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getByte(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getByte(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -640,18 +631,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BINARY&lt;/code&gt; or
-            &lt;code&gt;VARBINARY&lt;/code&gt; parameter as an array of &lt;code&gt;byte&lt;/code&gt;
-            values in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;BINARY&lt;/code&gt; or &lt;code&gt;VARBINARY&lt;/code&gt;
+            parameter as an array of &lt;code&gt;byte&lt;/code&gt; values in the Java
+            programming language.</summary>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is
+             &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBytes(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBytes(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getBytes(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getBytes(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -734,17 +723,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <summary>Retrieves the value of the designated parameter as a
             &lt;code&gt;java.</summary>
         <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the parameter
             value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getCharacterStream(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getCharacterStream(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getCharacterStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getCharacterStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -828,18 +816,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, and
-            so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;CLOB&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;CLOB&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value as a &lt;code&gt;Clob&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getClob(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getClob(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getClob(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getClob(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -922,17 +908,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+            is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDate(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDate(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDate(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDate(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -970,9 +954,10 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">the <c>Calendar</c> to use to construct the date</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
+            and so on</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the date</param>
         <summary>Retrieves the value of the designated JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
@@ -980,7 +965,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDate(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDate(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDate(int,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDate(int, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -1018,18 +1003,17 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="cal">used for creating the returned <c>Date</c>.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the date</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;DATE&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the result is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDate(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDate(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDate(java.lang.String,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDate(java.lang.String, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -1112,17 +1096,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DOUBLE&lt;/code&gt; parameter as a &lt;code&gt;double&lt;/code&gt;
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;DOUBLE&lt;/code&gt; parameter as a &lt;code&gt;double&lt;/code&gt;
             in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDouble(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDouble(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getDouble(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getDouble(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1205,17 +1187,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;FLOAT&lt;/code&gt; parameter
-            as a &lt;code&gt;float&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;FLOAT&lt;/code&gt; parameter as a &lt;code&gt;float&lt;/code&gt;
+            in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getFloat(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getFloat(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getFloat(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getFloat(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1298,17 +1278,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;INTEGER&lt;/code&gt; parameter
-            as an &lt;code&gt;int&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;INTEGER&lt;/code&gt; parameter as an &lt;code&gt;int&lt;/code&gt;
+            in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getInt(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getInt(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getInt(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getInt(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1391,17 +1369,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;BIGINT&lt;/code&gt; parameter
-            as a &lt;code&gt;long&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-            is &lt;code&gt;0&lt;/code&gt;.</returns>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;BIGINT&lt;/code&gt; parameter as a &lt;code&gt;long&lt;/code&gt;
+            in the Java programming language.</summary>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the result is &lt;code&gt;0&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getLong(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getLong(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getLong(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getLong(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1484,17 +1460,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <summary>Retrieves the value of the designated parameter as a
             &lt;code&gt;java.</summary>
         <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the parameter
             value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getNCharacterStream(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getNCharacterStream(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getNCharacterStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getNCharacterStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1578,18 +1553,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, and
-            so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;NCLOB&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;NCLOB&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value as a &lt;code&gt;NClob&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getNClob(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getNClob(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getNClob(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getNClob(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1673,8 +1646,7 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <summary>Retrieves the value of the designated &lt;code&gt;NCHAR&lt;/code&gt;,
             &lt;code&gt;NVARCHAR&lt;/code&gt;
             or &lt;code&gt;LONGNVARCHAR&lt;/code&gt; parameter as
@@ -1684,7 +1656,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getNString(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getNString(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getNString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getNString(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1766,16 +1738,14 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated parameter as an &lt;code&gt;Object&lt;/code&gt;
-            in the Java programming language.</summary>
-        <returns>A &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a parameter as an &lt;code&gt;Object&lt;/code&gt; in the Java
+            programming language.</summary>
+        <returns>A &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getObject(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getObject(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getObject(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getObject(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1813,16 +1783,16 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">To be added.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated parameter as an &lt;code&gt;Object&lt;/code&gt;
-            in the Java programming language.</summary>
-        <returns>A &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
+        <param name="parameterIndex">the first parameter is 1, the second is 2, and so on</param>
+        <param name="map">the mapping from SQL type names to Java classes</param>
+        <summary>Returns an object representing the value of OUT parameter
+            &lt;code&gt;parameterIndex&lt;/code&gt; and uses &lt;code&gt;map&lt;/code&gt; for the custom
+            mapping of the parameter value.</summary>
+        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getObject(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getObject(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getObject(int,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getObject(int, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -1857,17 +1827,16 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="parameterName">To be added.</param>
-        <param name="map">To be added.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated parameter as an &lt;code&gt;Object&lt;/code&gt;
-            in the Java programming language.</summary>
-        <returns>A &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="map">the mapping from SQL type names to Java classes</param>
+        <summary>Returns an object representing the value of OUT parameter
+            &lt;code&gt;parameterName&lt;/code&gt; and uses &lt;code&gt;map&lt;/code&gt; for the custom
+            mapping of the parameter value.</summary>
+        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the OUT parameter value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getObject(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getObject(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getObject(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getObject(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -1948,18 +1917,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;REF(&amp;lt;structured-type&amp;gt;)&lt;/code&gt;
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;REF(&amp;lt;structured-type&amp;gt;)&lt;/code&gt;
             parameter as a <c>java.sql.Ref</c> object in the Java programming language.</summary>
         <returns>the parameter value as a &lt;code&gt;Ref&lt;/code&gt; object in the
-            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the value
-            &lt;code&gt;null&lt;/code&gt; is returned.</returns>
+                    Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;,
+                    the value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getRef(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getRef(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getRef(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getRef(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2042,8 +2009,7 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,...</param>
+        <param name="parameterName">the name of the parameter</param>
         <summary>Retrieves the value of the designated JDBC &lt;code&gt;ROWID&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>a &lt;code&gt;RowId&lt;/code&gt; object that represents the JDBC &lt;code&gt;ROWID&lt;/code&gt;
@@ -2052,7 +2018,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getRowId(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getRowId(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getRowId(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getRowId(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2135,17 +2101,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;SMALLINT&lt;/code&gt; parameter
-            as a &lt;code&gt;short&lt;/code&gt; in the Java programming language.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;SMALLINT&lt;/code&gt; parameter as a &lt;code&gt;short&lt;/code&gt;
+            in the Java programming language.</summary>
         <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
             is &lt;code&gt;0&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getShort(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getShort(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getShort(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getShort(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2226,15 +2190,14 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <summary>Retrieves the value of the designated &lt;code&gt;SQL XML&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getSQLXML(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getSQLXML(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getSQLXML(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getSQLXML(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2319,19 +2282,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the desired parameter's name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-            and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;CHAR&lt;/code&gt;,
-            &lt;code&gt;VARCHAR&lt;/code&gt;, or &lt;code&gt;LONGVARCHAR&lt;/code&gt; parameter as a
-            &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
-        <returns>the parameter value. If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
-                    the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;CHAR&lt;/code&gt;, &lt;code&gt;VARCHAR&lt;/code&gt;,
+            or &lt;code&gt;LONGVARCHAR&lt;/code&gt; parameter as a &lt;code&gt;String&lt;/code&gt; in
+            the Java programming language.</summary>
+        <returns>the parameter value. If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
+            is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getString(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getString(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getString(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2414,17 +2374,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+            is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTime(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTime(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTime(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTime(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2462,17 +2420,18 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">the calendar to use in constructing <c>Time</c>.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
+            and so on</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the time</param>
         <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
+        <returns>the parameter value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
                     is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTime(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTime(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTime(int,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTime(int, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2511,18 +2470,17 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="cal">used for creating the returned <c>Time</c></param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the time</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;TIME&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>the parameter value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is
+            &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTime(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTime(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTime(java.lang.String,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTime(java.lang.String, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2606,17 +2564,15 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+            is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTimestamp(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTimestamp(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTimestamp(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTimestamp(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2654,9 +2610,10 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">used for creating the returned <c>Timestamp</c></param>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
+            and so on</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the timestamp</param>
         <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
         <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
@@ -2664,7 +2621,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTimestamp(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTimestamp(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTimestamp(int,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTimestamp(int, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2702,18 +2659,17 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="cal">used for creating the returned <c>Timestamp</c></param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the timestamp</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;TIMESTAMP&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
-        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result
-                    is &lt;code&gt;null&lt;/code&gt;.</returns>
+        <returns>the parameter value.  If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is
+            &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTimestamp(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTimestamp(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getTimestamp(java.lang.String,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getTimestamp(java.lang.String, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2796,17 +2752,16 @@
         <Parameter Name="parameterName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name of the desired parameter.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,...</param>
-        <summary>Retrieves the value of the designated JDBC &lt;code&gt;DATALINK&lt;/code&gt; parameter as a
+        <param name="parameterName">the name of the parameter</param>
+        <summary>Retrieves the value of a JDBC &lt;code&gt;DATALINK&lt;/code&gt; parameter as a
             &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.net.URL&lt;/code&gt; object that represents the
-                    JDBC &lt;code&gt;DATALINK&lt;/code&gt; value used as the designated
-                    parameter</returns>
+        <returns>the parameter value as a &lt;code&gt;java.net.URL&lt;/code&gt; object in the
+            Java programming language.  If the value was SQL &lt;code&gt;NULL&lt;/code&gt;, the
+            value &lt;code&gt;null&lt;/code&gt; is returned.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getURL(int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getURL(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#getURL(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.getURL(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2895,21 +2850,19 @@
         <Parameter Name="sqlType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="sqlType">the JDBC type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.
-                   If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
-                   or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
-                   &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
-                   should be used.</param>
-        <summary>Registers the OUT parameter in ordinal position
-            &lt;code&gt;parameterIndex&lt;/code&gt; to the JDBC type
+            If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
+            or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
+            &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
+            should be used.</param>
+        <summary>Registers the OUT parameter named
+            &lt;code&gt;parameterName&lt;/code&gt; to the JDBC type
             &lt;code&gt;sqlType&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2948,22 +2901,18 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="scale">the number of digits after the decimal point. Must be greater
-            than or equal to 0.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <param name="sqlType">the JDBC type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.
-                   If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
-                   or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
-                   &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
-                   should be used.</param>
-        <summary>Registers the OUT parameter in ordinal position
-            &lt;code&gt;parameterIndex&lt;/code&gt; to the JDBC type
+            and so on</param>
+        <param name="sqlType">the SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.</param>
+        <param name="scale">the desired number of digits to the right of the
+            decimal point.  It must be greater than or equal to zero.</param>
+        <summary>Registers the parameter in ordinal position
+            &lt;code&gt;parameterIndex&lt;/code&gt; to be of JDBC type
             &lt;code&gt;sqlType&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3002,22 +2951,14 @@
         <Parameter Name="typeName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="typeName">an SQL type name. For a <c>REF</c> type, this name should be
-            the fully qualified name of the referenced type.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <param name="sqlType">the JDBC type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.
-                   If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
-                   or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
-                   &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
-                   should be used.</param>
-        <summary>Registers the OUT parameter in ordinal position
-            &lt;code&gt;parameterIndex&lt;/code&gt; to the JDBC type
-            &lt;code&gt;sqlType&lt;/code&gt;.</summary>
+        <param name="parameterIndex">the first parameter is 1, the second is 2,...</param>
+        <param name="sqlType">a value from <c>java.sql.Types</c></param>
+        <param name="typeName">the fully-qualified name of an SQL structured type</param>
+        <summary>Registers the designated output parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(int, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3056,23 +2997,17 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name.</param>
-        <param name="scale">the number of digits after the decimal point. Must be greater
-            than or equal to 0.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <param name="sqlType">the JDBC type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.
-                   If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
-                   or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
-                   &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
-                   should be used.</param>
-        <summary>Registers the OUT parameter in ordinal position
-            &lt;code&gt;parameterIndex&lt;/code&gt; to the JDBC type
+        <param name="parameterName">the name of the parameter</param>
+        <param name="sqlType">SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.</param>
+        <param name="scale">the desired number of digits to the right of the
+            decimal point.  It must be greater than or equal to zero.</param>
+        <summary>Registers the parameter named
+            &lt;code&gt;parameterName&lt;/code&gt; to be of JDBC type
             &lt;code&gt;sqlType&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3111,24 +3046,14 @@
         <Parameter Name="typeName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the parameter name</param>
-        <param name="typeName">the fully qualified name of an SQL structured type. For a
-            <c>REF</c> type, this name should be the fully qualified name
-            of the referenced type.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2,
-                   and so on</param>
-        <param name="sqlType">the JDBC type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;.
-                   If the parameter is of JDBC type &lt;code&gt;NUMERIC&lt;/code&gt;
-                   or &lt;code&gt;DECIMAL&lt;/code&gt;, the version of
-                   &lt;code&gt;registerOutParameter&lt;/code&gt; that accepts a scale value
-                   should be used.</param>
-        <summary>Registers the OUT parameter in ordinal position
-            &lt;code&gt;parameterIndex&lt;/code&gt; to the JDBC type
-            &lt;code&gt;sqlType&lt;/code&gt;.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="sqlType">a value from <c>java.sql.Types</c></param>
+        <param name="typeName">the fully-qualified name of an SQL structured type</param>
+        <summary>Registers the designated output parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#registerOutParameter(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.registerOutParameter(java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3211,15 +3136,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the number of bytes in the <c>InputStream</c> to copy to the
-            parameter.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setAsciiStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setAsciiStream(java.lang.String, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setAsciiStream(java.lang.String,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setAsciiStream(java.lang.String, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3258,14 +3183,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setAsciiStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setAsciiStream(java.lang.String, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setAsciiStream(java.lang.String,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setAsciiStream(java.lang.String, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3393,15 +3319,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the number of bytes in the <c>InputStream</c> to copy to the
-            parameter.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBinaryStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBinaryStream(java.lang.String, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBinaryStream(java.lang.String,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBinaryStream(java.lang.String, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3440,14 +3366,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBinaryStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBinaryStream(java.lang.String, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBinaryStream(java.lang.String,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBinaryStream(java.lang.String, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3485,15 +3412,13 @@
         <Parameter Name="x" Type="Java.Sql.IBlob" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
         <param name="parameterName">the name of the parameter</param>
-        <param name="inputStream">An object that contains the data to set the parameter
-            value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <param name="x">a &lt;code&gt;Blob&lt;/code&gt; object that maps an SQL &lt;code&gt;BLOB&lt;/code&gt; value</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBlob(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBlob(java.lang.String, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBlob(java.lang.String,%20java.sql.Blob)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBlob(java.lang.String, java.sql.Blob)</code>.</a>
             </format>
           </para>
           <para>
@@ -3577,15 +3502,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
-        <param name="parameterName">the name of the parameter</param>
+        <param name="parameterName">the name of the parameter to be set
+            the second is 2, ...</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
+        <param name="length">the number of bytes in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBlob(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBlob(java.lang.String, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setBlob(java.lang.String,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setBlob(java.lang.String, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3802,16 +3728,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">a count of the characters contained in <c>reader</c>.</param>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
-                   Unicode data</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that
+                   contains the UNICODE data used as the designated parameter</param>
+        <param name="length">the number of characters in the stream</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setCharacterStream(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setCharacterStream(java.lang.String, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setCharacterStream(java.lang.String,%20java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setCharacterStream(java.lang.String, java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3850,16 +3776,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
-                   Unicode data</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that
+                   contains the UNICODE data used as the designated parameter</param>
+        <param name="length">the number of characters in the stream</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setCharacterStream(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setCharacterStream(java.lang.String, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setCharacterStream(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setCharacterStream(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3941,14 +3867,13 @@
         <Parameter Name="x" Type="Java.Sql.IClob" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
         <param name="parameterName">the name of the parameter</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="x">a &lt;code&gt;Clob&lt;/code&gt; object that maps an SQL &lt;code&gt;CLOB&lt;/code&gt; value</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setClob(java.lang.String, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setClob(java.lang.String,%20java.sql.Clob)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setClob(java.lang.String, java.sql.Clob)</code>.</a>
             </format>
           </para>
           <para>
@@ -3987,14 +3912,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
-        <param name="parameterName">the name of the parameter</param>
+        <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setClob(java.lang.String, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setClob(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setClob(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4077,15 +4002,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">a <c>Calendar</c> to use to construct the SQL <c>DATE</c>
-            value.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the date</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setDate(java.lang.String,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setDate(java.lang.String, java.sql.Date)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setDate(java.lang.String,%20java.sql.Date,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setDate(java.lang.String, java.sql.Date, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -4345,14 +4270,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
-        <param name="parameterName">the name of the parameter</param>
+        <param name="parameterName">the name of the parameter to be set</param>
         <param name="value">the parameter value</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNCharacterStream(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNCharacterStream(java.lang.String, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNCharacterStream(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNCharacterStream(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4434,14 +4359,13 @@
         <Parameter Name="value" Type="Java.Sql.INClob" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <param name="parameterName">the name of the parameter</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="parameterName">the name of the parameter to be set</param>
+        <param name="value">the parameter value</param>
+        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNClob(java.lang.String, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNClob(java.lang.String,%20java.sql.NClob)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNClob(java.lang.String, java.sql.NClob)</code>.</a>
             </format>
           </para>
           <para>
@@ -4480,14 +4404,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
-        <param name="parameterName">the name of the parameter</param>
+        <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNClob(java.lang.String, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNClob(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNClob(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -4614,17 +4538,16 @@
         <Parameter Name="typeName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="typeName">if the target parameter is a user defined type then this
-            should contain the full type name. The fully qualified name of
-            a <c>UDT</c> or <c>REF</c> type is ignored if the parameter
-            is not a <c>UDT</c>.</param>
         <param name="parameterName">the name of the parameter</param>
-        <param name="sqlType">the SQL type code defined in &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="typeName">the fully-qualified name of an SQL user-defined type;
+                   ignored if the parameter is not a user-defined type or
+                   SQL &lt;code&gt;REF&lt;/code&gt; value</param>
         <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNull(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNull(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setNull(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setNull(java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -4707,14 +4630,15 @@
         <Parameter Name="targetSqlType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="targetSqlType">a JDBC type expressed as a constant from <see cref="T:Java.Sql.Types" />.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the object containing the input parameter value</param>
+        <param name="targetSqlType">the SQL type (as defined in java.sql.Types) to be
+                                 sent to the database</param>
         <summary>Sets the value of the designated parameter with the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setObject(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setObject(java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setObject(java.lang.String,%20java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setObject(java.lang.String, java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4754,16 +4678,18 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="targetSqlType">a JDBC type expressed as a constant from <see cref="T:Java.Sql.Types" />.</param>
-        <param name="scale">where applicable, the number of digits after the decimal.
-            point.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the object containing the input parameter value</param>
+        <param name="targetSqlType">the SQL type (as defined in java.sql.Types) to be
+            sent to the database. The scale argument may further qualify this type.</param>
+        <param name="scale">for java.sql.Types.DECIMAL or java.sql.Types.NUMERIC types,
+                     this is the number of digits after the decimal point.  For all other
+                     types, this value will be ignored.</param>
         <summary>Sets the value of the designated parameter with the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setObject(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setObject(java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setObject(java.lang.String,%20java.lang.Object,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setObject(java.lang.String, java.lang.Object, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5022,14 +4948,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">used for creating the new SQL <c>TIME</c> value.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the time</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setTime(java.lang.String,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setTime(java.lang.String, java.sql.Time)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setTime(java.lang.String,%20java.sql.Time,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setTime(java.lang.String, java.sql.Time, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -5112,14 +5039,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">used for creating the new SQL <c>TIME</c> value.</param>
         <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the timestamp</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setTimestamp(java.lang.String,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setTimestamp(java.lang.String, java.sql.Timestamp)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/CallableStatement#setTimestamp(java.lang.String,%20java.sql.Timestamp,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.CallableStatement.setTimestamp(java.lang.String, java.sql.Timestamp, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IClob.xml b/docs/Mono.Android/en/Java.Sql/IClob.xml
index bbee2228fc..0e2423412b 100644
--- a/docs/Mono.Android/en/Java.Sql/IClob.xml
+++ b/docs/Mono.Android/en/Java.Sql/IClob.xml
@@ -165,16 +165,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="pos">To be added.</param>
-        <param name="length">To be added.</param>
-        <summary>Retrieves the &lt;code&gt;CLOB&lt;/code&gt; value designated by this &lt;code&gt;Clob&lt;/code&gt;
-            object as a &lt;code&gt;java.</summary>
-        <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object containing the
-                    &lt;code&gt;CLOB&lt;/code&gt; data</returns>
+        <param name="pos">the offset to the first character of the partial value to
+            be retrieved.  The first character in the Clob is at position 1.</param>
+        <param name="length">the length in characters of the partial value to be retrieved.</param>
+        <summary>Returns a &lt;code&gt;Reader&lt;/code&gt; object that contains a partial &lt;code&gt;Clob&lt;/code&gt; value, starting
+            with the character specified by pos, which is length characters in length.</summary>
+        <returns>&lt;code&gt;Reader&lt;/code&gt; through which the partial &lt;code&gt;Clob&lt;/code&gt; value can be read.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Clob#getCharacterStream()" title="Reference documentation">Java documentation for <code>java.sql.Clob.getCharacterStream()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Clob#getCharacterStream(long,%20long)" title="Reference documentation">Java documentation for <code>java.sql.Clob.getCharacterStream(long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -303,18 +303,18 @@
         <Parameter Name="start" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="searchstr">the substring for which to search</param>
-        <param name="start">the position at which to begin searching; the first position
-                         is 1</param>
-        <summary>Retrieves the character position at which the specified substring
-            &lt;code&gt;searchstr&lt;/code&gt; appears in the SQL &lt;code&gt;CLOB&lt;/code&gt; value
-            represented by this &lt;code&gt;Clob&lt;/code&gt; object.</summary>
-        <returns>the position at which the substring appears or -1 if it is not
-                    present; the first position is 1</returns>
+        <param name="searchstr">the &lt;code&gt;Clob&lt;/code&gt; object for which to search</param>
+        <param name="start">the position at which to begin searching; the first
+                         position is 1</param>
+        <summary>Retrieves the character position at which the specified
+            &lt;code&gt;Clob&lt;/code&gt; object &lt;code&gt;searchstr&lt;/code&gt; appears in this
+            &lt;code&gt;Clob&lt;/code&gt; object.</summary>
+        <returns>the position at which the &lt;code&gt;Clob&lt;/code&gt; object appears
+                         or -1 if it is not present; the first position is 1</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Clob#position(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>java.sql.Clob.position(java.lang.String, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Clob#position(java.sql.Clob,%20long)" title="Reference documentation">Java documentation for <code>java.sql.Clob.position(java.sql.Clob, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -545,21 +545,21 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the offset within <c>str</c> to start writing from.</param>
-        <param name="len">the number of characters to write.</param>
-        <param name="pos">the position at which to start writing to the &lt;code&gt;CLOB&lt;/code&gt;
-                    value that this &lt;code&gt;Clob&lt;/code&gt; object represents;
-            The first position is 1</param>
+        <param name="pos">the position at which to start writing to this
+                   &lt;code&gt;CLOB&lt;/code&gt; object; The first position  is 1</param>
         <param name="str">the string to be written to the &lt;code&gt;CLOB&lt;/code&gt;
-                   value that this &lt;code&gt;Clob&lt;/code&gt; designates</param>
-        <summary>Writes the given Java &lt;code&gt;String&lt;/code&gt; to the &lt;code&gt;CLOB&lt;/code&gt;
-            value that this &lt;code&gt;Clob&lt;/code&gt; object designates at the position
-            &lt;code&gt;pos&lt;/code&gt;.</summary>
+                   value that this &lt;code&gt;Clob&lt;/code&gt; object represents</param>
+        <param name="offset">the offset into &lt;code&gt;str&lt;/code&gt; to start reading
+                   the characters to be written</param>
+        <param name="len">the number of characters to be written</param>
+        <summary>Writes &lt;code&gt;len&lt;/code&gt; characters of &lt;code&gt;str&lt;/code&gt;, starting
+            at character &lt;code&gt;offset&lt;/code&gt;, to the &lt;code&gt;CLOB&lt;/code&gt; value
+            that this &lt;code&gt;Clob&lt;/code&gt; represents.</summary>
         <returns>the number of characters written</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Clob#setString(long,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Clob.setString(long, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Clob#setString(long,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Clob.setString(long, java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IConnection.xml b/docs/Mono.Android/en/Java.Sql/IConnection.xml
index 3e3a59e2b0..381c68c211 100644
--- a/docs/Mono.Android/en/Java.Sql/IConnection.xml
+++ b/docs/Mono.Android/en/Java.Sql/IConnection.xml
@@ -552,17 +552,22 @@
         <Parameter Name="resultSetConcurrency" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resultSetType">one of the following type specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollSensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollInsensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeForwardOnly" /></term></item></list></param>
-        <param name="resultSetConcurrency">one of the following concurrency mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.ConcurUpdatable" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.ConcurReadOnly" /></term></item></list></param>
-        <summary>Creates a &lt;code&gt;Statement&lt;/code&gt; object for sending
-            SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;Statement&lt;/code&gt; object</returns>
+        <param name="resultSetType">a result set type; one of
+                   &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
+                   &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
+                   &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="resultSetConcurrency">a concurrency type; one of
+                   &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
+                   &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
+        <summary>Creates a &lt;code&gt;Statement&lt;/code&gt; object that will generate
+            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
+        <returns>a new &lt;code&gt;Statement&lt;/code&gt; object that will generate
+                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and
+                    concurrency</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#createStatement()" title="Reference documentation">Java documentation for <code>java.sql.Connection.createStatement()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#createStatement(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Connection.createStatement(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -601,19 +606,29 @@
         <Parameter Name="resultSetHoldability" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resultSetType">one of the following type specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollSensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollInsensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeForwardOnly" /></term></item></list></param>
-        <param name="resultSetConcurrency">one of the following concurrency mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.ConcurUpdatable" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.ConcurReadOnly" /></term></item></list></param>
-        <param name="resultSetHoldability">one of the following holdability mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.HoldCursorsOverCommit" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.CloseCursorsAtCommit" /></term></item></list></param>
-        <summary>Creates a &lt;code&gt;Statement&lt;/code&gt; object for sending
-            SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;Statement&lt;/code&gt; object</returns>
+        <param name="resultSetType">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="resultSetConcurrency">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
+        <param name="resultSetHoldability">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.HOLD_CURSORS_OVER_COMMIT&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CLOSE_CURSORS_AT_COMMIT&lt;/code&gt;</param>
+        <summary>Creates a &lt;code&gt;Statement&lt;/code&gt; object that will generate
+            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type, concurrency,
+            and holdability.</summary>
+        <returns>a new &lt;code&gt;Statement&lt;/code&gt; object that will generate
+                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type,
+                    concurrency, and holdability</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#createStatement()" title="Reference documentation">Java documentation for <code>java.sql.Connection.createStatement()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#createStatement(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Connection.createStatement(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -700,16 +715,15 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Returns a list containing the name and current value of each client info
-            property supported by the driver.</summary>
-        <returns>A &lt;code&gt;Properties&lt;/code&gt; object that contains the name and current value of
-                                 each of the client info properties supported by the driver.
+        <param name="name">The name of the client info property to retrieve
+            &lt;p&gt;</param>
+        <summary>Returns the value of the client info property specified by name.</summary>
+        <returns>The value of the client info property specified
             &lt;p&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#getClientInfo()" title="Reference documentation">Java documentation for <code>java.sql.Connection.getClientInfo()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#getClientInfo(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.getClientInfo(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -987,21 +1001,24 @@
         <Parameter Name="resultSetConcurrency" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resultSetType">one of the following type specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollSensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollInsensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeForwardOnly" /></term></item></list></param>
-        <param name="resultSetConcurrency">one of the following concurrency mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.ConcurReadOnly" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.ConcurUpdatable" /></term></item></list></param>
-        <param name="sql">an SQL statement that may contain one or more '?'
-            parameter placeholders. Typically this statement is specified using JDBC
-            call escape syntax.</param>
-        <summary>Creates a &lt;code&gt;CallableStatement&lt;/code&gt; object for calling
-            database stored procedures.</summary>
-        <returns>a new default &lt;code&gt;CallableStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement</returns>
+        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+                       be sent to the database; may contain on or more '?' parameters</param>
+        <param name="resultSetType">a result set type; one of
+                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="resultSetConcurrency">a concurrency type; one of
+                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
+        <summary>Creates a &lt;code&gt;CallableStatement&lt;/code&gt; object that will generate
+            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
+        <returns>a new &lt;code&gt;CallableStatement&lt;/code&gt; object containing the
+            pre-compiled SQL statement that will produce &lt;code&gt;ResultSet&lt;/code&gt;
+            objects with the given type and concurrency</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#prepareCall(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareCall(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#prepareCall(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareCall(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1041,23 +1058,31 @@
         <Parameter Name="resultSetHoldability" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resultSetType">one of the following type specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollSensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollInsensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeForwardOnly" /></term></item></list></param>
-        <param name="resultSetConcurrency">one of the following concurrency mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.ConcurReadOnly" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.ConcurUpdatable" /></term></item></list></param>
-        <param name="resultSetHoldability">one of the following holdability mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.HoldCursorsOverCommit" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.CloseCursorsAtCommit" /></term></item></list></param>
-        <param name="sql">an SQL statement that may contain one or more '?'
-            parameter placeholders. Typically this statement is specified using JDBC
-            call escape syntax.</param>
-        <summary>Creates a &lt;code&gt;CallableStatement&lt;/code&gt; object for calling
-            database stored procedures.</summary>
-        <returns>a new default &lt;code&gt;CallableStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement</returns>
+        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+                       be sent to the database; may contain on or more '?' parameters</param>
+        <param name="resultSetType">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="resultSetConcurrency">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
+        <param name="resultSetHoldability">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.HOLD_CURSORS_OVER_COMMIT&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CLOSE_CURSORS_AT_COMMIT&lt;/code&gt;</param>
+        <summary>Creates a &lt;code&gt;CallableStatement&lt;/code&gt; object that will generate
+            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
+        <returns>a new &lt;code&gt;CallableStatement&lt;/code&gt; object, containing the
+                    pre-compiled SQL statement, that will generate
+                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type,
+                    concurrency, and holdability</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#prepareCall(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareCall(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#prepareCall(java.lang.String,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareCall(java.lang.String, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1141,18 +1166,21 @@
         <Parameter Name="autoGeneratedKeys" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="autoGeneratedKeys">one of the following generated key options:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.Statement.ReturnGeneratedKeys" /></term></item><item><term><see cref="F:Java.Sql.Statement.NoGeneratedKeys" /></term></item></list></param>
         <param name="sql">an SQL statement that may contain one or more '?' IN
-            parameter placeholders</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object for sending
-            parameterized SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;PreparedStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement</returns>
+                   parameter placeholders</param>
+        <param name="autoGeneratedKeys">a flag indicating whether auto-generated keys
+                   should be returned; one of
+                   &lt;code&gt;Statement.RETURN_GENERATED_KEYS&lt;/code&gt; or
+                   &lt;code&gt;Statement.NO_GENERATED_KEYS&lt;/code&gt;</param>
+        <summary>Creates a default &lt;code&gt;PreparedStatement&lt;/code&gt; object that has
+            the capability to retrieve auto-generated keys.</summary>
+        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+                    pre-compiled SQL statement, that will have the capability of
+                    returning auto-generated keys</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1190,18 +1218,20 @@
         <Parameter Name="columnIndexes" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="columnIndexes">the indexes of the columns for which auto-generated keys
-            should be made available.</param>
         <param name="sql">an SQL statement that may contain one or more '?' IN
-            parameter placeholders</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object for sending
-            parameterized SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;PreparedStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement</returns>
+                   parameter placeholders</param>
+        <param name="columnIndexes">an array of column indexes indicating the columns
+                   that should be returned from the inserted row or rows</param>
+        <summary>Creates a default &lt;code&gt;PreparedStatement&lt;/code&gt; object capable
+            of returning the auto-generated keys designated by the given array.</summary>
+        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+                    pre-compiled statement, that is capable of returning the
+                    auto-generated keys designated by the given array of column
+                    indexes</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1239,18 +1269,20 @@
         <Parameter Name="columnNames" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="columnNames">the names of the columns for which auto-generated keys should
-            be made available.</param>
         <param name="sql">an SQL statement that may contain one or more '?' IN
-            parameter placeholders</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object for sending
-            parameterized SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;PreparedStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement</returns>
+                   parameter placeholders</param>
+        <param name="columnNames">an array of column names indicating the columns
+                   that should be returned from the inserted row or rows</param>
+        <summary>Creates a default &lt;code&gt;PreparedStatement&lt;/code&gt; object capable
+            of returning the auto-generated keys designated by the given array.</summary>
+        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+                    pre-compiled statement, that is capable of returning the
+                    auto-generated keys designated by the given array of column
+                    names</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1289,20 +1321,25 @@
         <Parameter Name="resultSetConcurrency" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resultSetType">one of the following type specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollSensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollInsensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeForwardOnly" /></term></item></list></param>
-        <param name="resultSetConcurrency">one of the following concurrency mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.ConcurReadOnly" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.ConcurUpdatable" /></term></item></list></param>
-        <param name="sql">an SQL statement that may contain one or more '?' IN
-            parameter placeholders</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object for sending
-            parameterized SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;PreparedStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement</returns>
+        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+                       be sent to the database; may contain one or more '?' IN
+                       parameters</param>
+        <param name="resultSetType">a result set type; one of
+                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="resultSetConcurrency">a concurrency type; one of
+                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
+        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object that will generate
+            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type and concurrency.</summary>
+        <returns>a new PreparedStatement object containing the
+            pre-compiled SQL statement that will produce &lt;code&gt;ResultSet&lt;/code&gt;
+            objects with the given type and concurrency</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1342,22 +1379,33 @@
         <Parameter Name="resultSetHoldability" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="resultSetType">one of the following type specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollSensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeScrollInsensitive" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.TypeForwardOnly" /></term></item></list></param>
-        <param name="resultSetConcurrency">one of the following concurrency mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.ConcurReadOnly" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.ConcurUpdatable" /></term></item></list></param>
-        <param name="resultSetHoldability">one of the following holdability mode specifiers:
-            <list type="bullet"><item><term><see cref="F:Java.Sql.ResultSet.HoldCursorsOverCommit" /></term></item><item><term><see cref="F:Java.Sql.ResultSet.CloseCursorsAtCommit" /></term></item></list></param>
-        <param name="sql">an SQL statement that may contain one or more '?' IN
-            parameter placeholders</param>
-        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object for sending
-            parameterized SQL statements to the database.</summary>
-        <returns>a new default &lt;code&gt;PreparedStatement&lt;/code&gt; object containing the
-            pre-compiled SQL statement</returns>
+        <param name="sql">a &lt;code&gt;String&lt;/code&gt; object that is the SQL statement to
+                       be sent to the database; may contain one or more '?' IN
+                       parameters</param>
+        <param name="resultSetType">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.TYPE_FORWARD_ONLY&lt;/code&gt;,
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_INSENSITIVE&lt;/code&gt;, or
+                    &lt;code&gt;ResultSet.TYPE_SCROLL_SENSITIVE&lt;/code&gt;</param>
+        <param name="resultSetConcurrency">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.CONCUR_READ_ONLY&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CONCUR_UPDATABLE&lt;/code&gt;</param>
+        <param name="resultSetHoldability">one of the following &lt;code&gt;ResultSet&lt;/code&gt;
+                   constants:
+                    &lt;code&gt;ResultSet.HOLD_CURSORS_OVER_COMMIT&lt;/code&gt; or
+                    &lt;code&gt;ResultSet.CLOSE_CURSORS_AT_COMMIT&lt;/code&gt;</param>
+        <summary>Creates a &lt;code&gt;PreparedStatement&lt;/code&gt; object that will generate
+            &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type, concurrency,
+            and holdability.</summary>
+        <returns>a new &lt;code&gt;PreparedStatement&lt;/code&gt; object, containing the
+                    pre-compiled SQL statement, that will generate
+                    &lt;code&gt;ResultSet&lt;/code&gt; objects with the given type,
+                    concurrency, and holdability</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#prepareStatement(java.lang.String,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Connection.prepareStatement(java.lang.String, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1518,14 +1566,13 @@
         <Parameter Name="savepoint" Type="Java.Sql.ISavepoint" />
       </Parameters>
       <Docs>
-        <param name="savepoint">the Savepoint to roll back to</param>
-        <summary>Undoes all changes made in the current transaction
-            and releases any database locks currently held
-            by this &lt;code&gt;Connection&lt;/code&gt; object.</summary>
+        <param name="savepoint">the &lt;code&gt;Savepoint&lt;/code&gt; object to roll back to</param>
+        <summary>Undoes all changes made after the given &lt;code&gt;Savepoint&lt;/code&gt; object
+            was set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#rollback()" title="Reference documentation">Java documentation for <code>java.sql.Connection.rollback()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#rollback(java.sql.Savepoint)" title="Reference documentation">Java documentation for <code>java.sql.Connection.rollback(java.sql.Savepoint)</code>.</a>
             </format>
           </para>
           <para>
@@ -1652,14 +1699,14 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">the name to use for the new <c>Savepoint</c>.</param>
-        <summary>Creates an unnamed savepoint in the current transaction and
-            returns the new &lt;code&gt;Savepoint&lt;/code&gt; object that represents it.</summary>
+        <param name="name">a &lt;code&gt;String&lt;/code&gt; containing the name of the savepoint</param>
+        <summary>Creates a savepoint with the given name in the current transaction
+            and returns the new &lt;code&gt;Savepoint&lt;/code&gt; object that represents it.</summary>
         <returns>the new &lt;code&gt;Savepoint&lt;/code&gt; object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Connection#setSavepoint()" title="Reference documentation">Java documentation for <code>java.sql.Connection.setSavepoint()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Connection#setSavepoint(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Connection.setSavepoint(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml b/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml
index c2f2b1e13d..2d38a3b640 100644
--- a/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml
+++ b/docs/Mono.Android/en/Java.Sql/IDatabaseMetaData.xml
@@ -2437,15 +2437,19 @@
         <Parameter Name="schemaPattern" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="catalog">the catalog</param>
-        <param name="schemaPattern">the schema pattern</param>
+        <param name="catalog">a catalog name; must match the catalog name as it is stored
+            in the database;"" retrieves those without a catalog; null means catalog
+            name should not be used to narrow down the search.</param>
+        <param name="schemaPattern">a schema name; must match the schema name as it is
+            stored in the database; null means
+            schema name should not be used to narrow down the search.</param>
         <summary>Retrieves the schema names available in this database.</summary>
         <returns>a &lt;code&gt;ResultSet&lt;/code&gt; object in which each row is a
                     schema description</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/DatabaseMetaData#getSchemas()" title="Reference documentation">Java documentation for <code>java.sql.DatabaseMetaData.getSchemas()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/DatabaseMetaData#getSchemas(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.DatabaseMetaData.getSchemas(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -6072,15 +6076,18 @@
         <Parameter Name="toType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromType">the Type to convert from, as defined by <c>java.sql.Types</c></param>
-        <param name="toType">the Type to convert to, as defined by <c>java.sql.Types</c></param>
+        <param name="fromType">the type to convert from; one of the type codes from
+                   the class &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="toType">the type to convert to; one of the type codes from
+                   the class &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
         <summary>Retrieves whether this database supports the JDBC scalar function
-            &lt;code&gt;CONVERT&lt;/code&gt; for the conversion of one JDBC type to another.</summary>
+            &lt;code&gt;CONVERT&lt;/code&gt; for conversions between the JDBC types <i>fromType</i>
+            and <i>toType</i>.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if so; &lt;code&gt;false&lt;/code&gt; otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/DatabaseMetaData#supportsConvert()" title="Reference documentation">Java documentation for <code>java.sql.DatabaseMetaData.supportsConvert()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/DatabaseMetaData#supportsConvert(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.DatabaseMetaData.supportsConvert(int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml b/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml
index 66d70bb937..e601d17e7b 100644
--- a/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml
+++ b/docs/Mono.Android/en/Java.Sql/IPreparedStatement.xml
@@ -430,15 +430,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the number of bytes in the <c>InputStream</c> to copy to the
-            parameter.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setAsciiStream(int,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setAsciiStream(int, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -477,14 +477,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">character count</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setAsciiStream(int,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setAsciiStream(int, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -611,15 +612,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the number of bytes in the <c>InputStream</c> to copy to the
-            parameter.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBinaryStream(int,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBinaryStream(int, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -658,14 +659,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">character count</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
-        <summary>Sets the designated parameter to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBinaryStream(int,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBinaryStream(int, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -703,16 +705,13 @@
         <Parameter Name="x" Type="Java.Sql.IBlob" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1,
-            the second is 2, ...</param>
-        <param name="inputStream">An object that contains the data to set the parameter
-            value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="x">a &lt;code&gt;Blob&lt;/code&gt; object that maps an SQL &lt;code&gt;BLOB&lt;/code&gt; value</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBlob(int,%20java.sql.Blob)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBlob(int, java.sql.Blob)</code>.</a>
             </format>
           </para>
           <para>
@@ -797,16 +796,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">character count</param>
         <param name="parameterIndex">index of the first parameter is 1,
             the second is 2, ...</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
+        <param name="length">the number of bytes in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setBlob(int,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setBlob(int, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1023,16 +1022,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the number of characters to be read.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
                    Unicode data</param>
+        <param name="length">the number of characters in the stream</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setCharacterStream(int,%20java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setCharacterStream(int, java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1071,16 +1070,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">character count</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
                    Unicode data</param>
+        <param name="length">the number of characters in the stream</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setCharacterStream(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setCharacterStream(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1162,14 +1161,13 @@
         <Parameter Name="x" Type="Java.Sql.IClob" />
       </Parameters>
       <Docs>
-        <param name="x">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="x">a &lt;code&gt;Clob&lt;/code&gt; object that maps an SQL &lt;code&gt;CLOB&lt;/code&gt; value</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setClob(int,%20java.sql.Clob)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setClob(int, java.sql.Clob)</code>.</a>
             </format>
           </para>
           <para>
@@ -1208,14 +1206,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">character count</param>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setClob(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setClob(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1298,15 +1296,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">a <c>Calendar</c> to use to construct the SQL <c>DATE</c>
-            value.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the date</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setDate(int,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setDate(int, java.sql.Date)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setDate(int,%20java.sql.Date,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setDate(int, java.sql.Date, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -1566,14 +1564,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">character count</param>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNCharacterStream(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNCharacterStream(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1655,14 +1653,13 @@
         <Parameter Name="value" Type="Java.Sql.INClob" />
       </Parameters>
       <Docs>
-        <param name="value">the <c>NClob</c> to which the parameter at <c>parameterIndex</c> is set.</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
+        <param name="value">the parameter value</param>
+        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNClob(int,%20java.sql.NClob)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNClob(int, java.sql.NClob)</code>.</a>
             </format>
           </para>
           <para>
@@ -1701,14 +1698,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">character count</param>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNClob(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNClob(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1835,15 +1832,15 @@
         <Parameter Name="typeName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="typeName">the fully qualified name of a UDT or REF type - ignored if the
-            parameter is not a UDT.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">the SQL type code defined in &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="typeName">the fully-qualified name of an SQL user-defined type;
+             ignored if the parameter is not a user-defined type or REF</param>
         <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNull(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNull(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setNull(int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setNull(int, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1926,14 +1923,15 @@
         <Parameter Name="targetSqlType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="targetSqlType">the SQL type to send to the database, as defined in <c>java.sql.Types</c>.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the object containing the input parameter value</param>
-        <summary>Sets the value of the designated parameter using the given object.</summary>
+        <param name="targetSqlType">the SQL type (as defined in java.sql.Types) to be
+                                 sent to the database</param>
+        <summary>Sets the value of the designated parameter with the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setObject(int,%20java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setObject(int, java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1973,15 +1971,22 @@
         <Parameter Name="scaleOrLength" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="targetSqlType">the SQL type to send to the database, as defined in <c>java.sql.Types</c>.</param>
-        <param name="scaleOrLength">To be added.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the object containing the input parameter value</param>
-        <summary>Sets the value of the designated parameter using the given object.</summary>
+        <param name="targetSqlType">the SQL type (as defined in java.sql.Types) to be
+            sent to the database. The scale argument may further qualify this type.</param>
+        <param name="scaleOrLength">for &lt;code&gt;java.sql.Types.DECIMAL&lt;/code&gt;
+                     or &lt;code&gt;java.sql.Types.NUMERIC types&lt;/code&gt;,
+                     this is the number of digits after the decimal point. For
+                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     this is the length
+                     of the data in the stream or reader.  For all other types,
+                     this value will be ignored.</param>
+        <summary>Sets the value of the designated parameter with the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setObject(int,%20java.lang.Object,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setObject(int, java.lang.Object, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2285,15 +2290,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">a <c>Calendar</c> to use to construct the SQL <c>TIME</c>
-            value.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the time</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setTime(int,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setTime(int, java.sql.Time)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setTime(int,%20java.sql.Time,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setTime(int, java.sql.Time, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2377,14 +2382,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">a <c>Calendar</c> to use to construct the SQL <c>TIMESTAMP</c> value</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the timestamp</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setTimestamp(int,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setTimestamp(int, java.sql.Timestamp)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/PreparedStatement#setTimestamp(int,%20java.sql.Timestamp,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.PreparedStatement.setTimestamp(int, java.sql.Timestamp, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IRef.xml b/docs/Mono.Android/en/Java.Sql/IRef.xml
index 3875f99ac9..6d4c772a11 100644
--- a/docs/Mono.Android/en/Java.Sql/IRef.xml
+++ b/docs/Mono.Android/en/Java.Sql/IRef.xml
@@ -96,16 +96,20 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">To be added.</param>
-        <summary>Retrieves the SQL structured type instance referenced by
-            this &lt;code&gt;Ref&lt;/code&gt; object.</summary>
-        <returns>a Java &lt;code&gt;Object&lt;/code&gt; that is the mapping for
+        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains
+                   the mapping to use (the fully-qualified name of the SQL
+                   structured type being referenced and the class object for
+                   &lt;code&gt;SQLData&lt;/code&gt; implementation to which the SQL
+                   structured type will be mapped)</param>
+        <summary>Retrieves the referenced object and maps it to a Java type
+            using the given type map.</summary>
+        <returns>a Java &lt;code&gt;Object&lt;/code&gt; that is the custom mapping for
                      the SQL structured type to which this &lt;code&gt;Ref&lt;/code&gt;
                      object refers</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Ref#getObject()" title="Reference documentation">Java documentation for <code>java.sql.Ref.getObject()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Ref#getObject(java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.Ref.getObject(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IResultSet.xml b/docs/Mono.Android/en/Java.Sql/IResultSet.xml
index 3fe24dd598..35bd1fe70a 100644
--- a/docs/Mono.Android/en/Java.Sql/IResultSet.xml
+++ b/docs/Mono.Android/en/Java.Sql/IResultSet.xml
@@ -848,17 +848,16 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as an &lt;code&gt;Array&lt;/code&gt; object
             in the Java programming language.</summary>
-        <returns>an &lt;code&gt;Array&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;ARRAY&lt;/code&gt; value in the specified column</returns>
+        <returns>an &lt;code&gt;Array&lt;/code&gt; object representing the SQL &lt;code&gt;ARRAY&lt;/code&gt; value in
+                    the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getArray(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getArray(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getArray(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getArray(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -943,19 +942,18 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a stream of ASCII characters.</summary>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a stream of
+            ASCII characters.</summary>
         <returns>a Java input stream that delivers the database column value
-            as a stream of one-byte ASCII characters;
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            as a stream of one-byte ASCII characters.
+            If the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getAsciiStream(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getAsciiStream(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getAsciiStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getAsciiStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1039,8 +1037,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
             &lt;code&gt;java.</summary>
@@ -1050,7 +1047,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBigDecimal(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBigDecimal(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBigDecimal(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBigDecimal(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1092,18 +1089,17 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="scale">the number of digits after the decimal point</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="scale">the number of digits to the right of the decimal point</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
-        <returns>the column value (full precision);
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
+            a &lt;code&gt;java.</summary>
+        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
+            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBigDecimal(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBigDecimal(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBigDecimal(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBigDecimal(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1145,19 +1141,17 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="scale">the number of digits after the decimal point</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="scale">the number of digits to the right of the decimal point</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
-            &lt;code&gt;java.</summary>
-        <returns>the column value (full precision);
-            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
+            a &lt;code&gt;java.</summary>
+        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
+            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBigDecimal(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBigDecimal(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBigDecimal(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBigDecimal(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1242,19 +1236,17 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a  stream of
-            uninterpreted bytes.</summary>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a stream of uninterpreted
+            &lt;code&gt;byte&lt;/code&gt;s.</summary>
         <returns>a Java input stream that delivers the database column value
-                    as a stream of uninterpreted bytes;
-                    if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-                    &lt;code&gt;null&lt;/code&gt;</returns>
+            as a stream of uninterpreted bytes;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the result is &lt;code&gt;null&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBinaryStream(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBinaryStream(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBinaryStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBinaryStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1337,17 +1329,16 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Blob&lt;/code&gt; object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Blob&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;BLOB&lt;/code&gt; value in the specified column</returns>
+        <returns>a &lt;code&gt;Blob&lt;/code&gt; object representing the SQL &lt;code&gt;BLOB&lt;/code&gt;
+                    value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBlob(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBlob(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBlob(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBlob(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1430,8 +1421,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;boolean&lt;/code&gt; in the Java programming language.</summary>
@@ -1440,7 +1430,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBoolean(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBoolean(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBoolean(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBoolean(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1523,8 +1513,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;byte&lt;/code&gt; in the Java programming language.</summary>
@@ -1533,7 +1522,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getByte(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getByte(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getByte(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getByte(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1616,8 +1605,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;byte&lt;/code&gt; array in the Java programming language.</summary>
@@ -1626,7 +1614,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBytes(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBytes(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getBytes(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getBytes(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1710,18 +1698,17 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
             &lt;code&gt;java.</summary>
         <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the column
             value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getCharacterStream(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getCharacterStream(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getCharacterStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getCharacterStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1804,17 +1791,16 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Clob&lt;/code&gt; object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Clob&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;CLOB&lt;/code&gt; value in the specified column</returns>
+        <returns>a &lt;code&gt;Clob&lt;/code&gt; object representing the SQL &lt;code&gt;CLOB&lt;/code&gt;
+            value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getClob(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getClob(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getClob(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getClob(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1897,8 +1883,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;java.</summary>
@@ -1907,7 +1892,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDate(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDate(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDate(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDate(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1945,17 +1930,18 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">a <c>java.util.Calendar</c> to use in constructing the Date.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+            to use in constructing the date</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
+        <returns>the column value as a &lt;code&gt;java.sql.Date&lt;/code&gt; object;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDate(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDate(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDate(int,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDate(int, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -1993,19 +1979,18 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="cal">
-          <c>java.util.Calendar</c> to use in constructing the Date.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+            to use in constructing the date</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
+        <returns>the column value as a &lt;code&gt;java.sql.Date&lt;/code&gt; object;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDate(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDate(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDate(java.lang.String,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDate(java.lang.String, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2088,8 +2073,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;double&lt;/code&gt; in the Java programming language.</summary>
@@ -2098,7 +2082,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDouble(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDouble(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getDouble(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getDouble(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2181,8 +2165,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;float&lt;/code&gt; in the Java programming language.</summary>
@@ -2191,7 +2174,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getFloat(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getFloat(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getFloat(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getFloat(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2274,8 +2257,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             an &lt;code&gt;int&lt;/code&gt; in the Java programming language.</summary>
@@ -2284,7 +2266,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getInt(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getInt(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getInt(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getInt(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2367,8 +2349,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;long&lt;/code&gt; in the Java programming language.</summary>
@@ -2377,7 +2358,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getLong(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getLong(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getLong(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getLong(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2460,18 +2441,17 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a
             &lt;code&gt;java.</summary>
         <returns>a &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the column
             value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-            &lt;code&gt;null&lt;/code&gt; in the Java programming language.</returns>
+            &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getNCharacterStream(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getNCharacterStream(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getNCharacterStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getNCharacterStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2552,17 +2532,16 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;NClob&lt;/code&gt; object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;NClob&lt;/code&gt; object representing the SQL
-                    &lt;code&gt;NCLOB&lt;/code&gt; value in the specified column</returns>
+        <returns>a &lt;code&gt;NClob&lt;/code&gt; object representing the SQL &lt;code&gt;NCLOB&lt;/code&gt;
+            value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getNClob(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getNClob(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getNClob(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getNClob(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2643,8 +2622,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
@@ -2653,7 +2631,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getNString(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getNString(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getNString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getNString(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2734,8 +2712,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Gets the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             an &lt;code&gt;Object&lt;/code&gt; in the Java programming language.</summary>
@@ -2743,7 +2720,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getObject(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getObject(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getObject(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getObject(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -2781,16 +2758,18 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <summary>Gets the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            an &lt;code&gt;Object&lt;/code&gt; in the Java programming language.</summary>
-        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the column value</returns>
+        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains the mapping
+            from SQL type names to classes in the Java programming language</param>
+        <summary>Retrieves the value of the designated column in the current row
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as an &lt;code&gt;Object&lt;/code&gt;
+            in the Java programming language.</summary>
+        <returns>an &lt;code&gt;Object&lt;/code&gt; in the Java programming language
+            representing the SQL value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getObject(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getObject(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getObject(int,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getObject(int, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -2825,17 +2804,18 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="map">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <summary>Gets the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            an &lt;code&gt;Object&lt;/code&gt; in the Java programming language.</summary>
-        <returns>a &lt;code&gt;java.lang.Object&lt;/code&gt; holding the column value</returns>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="map">a &lt;code&gt;java.util.Map&lt;/code&gt; object that contains the mapping
+            from SQL type names to classes in the Java programming language</param>
+        <summary>Retrieves the value of the designated column in the current row
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as an &lt;code&gt;Object&lt;/code&gt;
+            in the Java programming language.</summary>
+        <returns>an &lt;code&gt;Object&lt;/code&gt; representing the SQL value in the
+                    specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getObject(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getObject(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getObject(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getObject(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -2915,17 +2895,16 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;Ref&lt;/code&gt; object
             in the Java programming language.</summary>
-        <returns>a &lt;code&gt;Ref&lt;/code&gt; object representing an SQL &lt;code&gt;REF&lt;/code&gt;
-                    value</returns>
+        <returns>a &lt;code&gt;Ref&lt;/code&gt; object representing the SQL &lt;code&gt;REF&lt;/code&gt;
+                    value in the specified column</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getRef(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getRef(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getRef(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getRef(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3006,16 +2985,15 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row of this
             &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is a SQL &lt;code&gt;NULL&lt;/code&gt; the
+        <returns>the column value ; if the value is a SQL &lt;code&gt;NULL&lt;/code&gt; the
                 value returned is &lt;code&gt;null&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getRowId(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getRowId(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getRowId(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getRowId(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3097,8 +3075,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;short&lt;/code&gt; in the Java programming language.</summary>
@@ -3107,7 +3084,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getShort(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getShort(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getShort(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getShort(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3188,8 +3165,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in  the current row of
              this &lt;code&gt;ResultSet&lt;/code&gt; as a
             &lt;code&gt;java.</summary>
@@ -3197,7 +3173,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getSQLXML(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getSQLXML(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getSQLXML(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getSQLXML(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3279,8 +3255,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;String&lt;/code&gt; in the Java programming language.</summary>
@@ -3289,7 +3264,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getString(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getString(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getString(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3372,17 +3347,17 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+        <returns>the column value;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTime(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTime(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTime(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTime(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3420,17 +3395,18 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">a <c>Calendar</c> to use in creating the Java Time value.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+            to use in constructing the time</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
+        <returns>the column value as a &lt;code&gt;java.sql.Time&lt;/code&gt; object;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTime(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTime(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTime(int,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTime(int, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -3468,18 +3444,18 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="cal">a <c>Calendar</c> to use in creating the Java time value.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+            to use in constructing the time</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
+        <returns>the column value as a &lt;code&gt;java.sql.Time&lt;/code&gt; object;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTime(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTime(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTime(java.lang.String,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTime(java.lang.String, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -3562,8 +3538,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as
             a &lt;code&gt;java.</summary>
@@ -3572,7 +3547,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTimestamp(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTimestamp(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTimestamp(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTimestamp(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3610,17 +3585,18 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">Calendar to use in creating the Java timestamp value.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+            to use in constructing the timestamp</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
+        <returns>the column value as a &lt;code&gt;java.sql.Timestamp&lt;/code&gt; object;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTimestamp(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTimestamp(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTimestamp(int,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTimestamp(int, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -3658,18 +3634,18 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="cal">Calendar to use in creating the Java <c>Timestamp</c> value.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object
+            to use in constructing the date</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            a &lt;code&gt;java.</summary>
-        <returns>the column value; if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the
-            value returned is &lt;code&gt;null&lt;/code&gt;</returns>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
+        <returns>the column value as a &lt;code&gt;java.sql.Timestamp&lt;/code&gt; object;
+            if the value is SQL &lt;code&gt;NULL&lt;/code&gt;,
+            the value returned is &lt;code&gt;null&lt;/code&gt; in the Java programming language</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTimestamp(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTimestamp(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getTimestamp(java.lang.String,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getTimestamp(java.lang.String, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -3762,19 +3738,18 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
-            of this &lt;code&gt;ResultSet&lt;/code&gt; object as
-            as a stream of two-byte 3 characters.</summary>
+            of this &lt;code&gt;ResultSet&lt;/code&gt; object as a stream of two-byte
+            Unicode characters.</summary>
         <returns>a Java input stream that delivers the database column value
-                    as a stream of two-byte Unicode characters;
-                    if the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned is
-                    &lt;code&gt;null&lt;/code&gt;</returns>
+                    as a stream of two-byte Unicode characters.
+                    If the value is SQL &lt;code&gt;NULL&lt;/code&gt;, the value returned
+                    is &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getUnicodeStream(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getUnicodeStream(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getUnicodeStream(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getUnicodeStream(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3857,8 +3832,7 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the index of the column 1 is the first, 2 is the second,...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Retrieves the value of the designated column in the current row
             of this &lt;code&gt;ResultSet&lt;/code&gt; object as a &lt;code&gt;java.</summary>
         <returns>the column value as a &lt;code&gt;java.net.URL&lt;/code&gt; object;
@@ -3867,7 +3841,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#getURL(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getURL(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#getURL(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.getURL(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -4855,14 +4829,13 @@
         <Parameter Name="x" Type="Java.Sql.IArray" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateArray(int,%20java.sql.Array)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateArray(int, java.sql.Array)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateArray(java.lang.String,%20java.sql.Array)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateArray(java.lang.String, java.sql.Array)</code>.</a>
             </format>
           </para>
           <para>
@@ -4943,14 +4916,13 @@
         <Parameter Name="x" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with an ascii stream value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(java.lang.String, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -4988,14 +4960,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data to write from the stream</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an ascii stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with an ascii stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(int,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(int, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5034,14 +5007,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an ascii stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with an ascii stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(int,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(int, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -5079,15 +5053,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="length">the length of the data to write from the stream</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an ascii stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with an ascii stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(java.lang.String,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(java.lang.String, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5126,15 +5100,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with an ascii stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with an ascii stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateAsciiStream(java.lang.String,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateAsciiStream(java.lang.String, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -5215,14 +5189,13 @@
         <Parameter Name="x" Type="Java.Math.BigDecimal" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBigDecimal(int,%20java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBigDecimal(int, java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBigDecimal(java.lang.String,%20java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBigDecimal(java.lang.String, java.math.BigDecimal)</code>.</a>
             </format>
           </para>
           <para>
@@ -5303,14 +5276,13 @@
         <Parameter Name="x" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a binary stream value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(java.lang.String, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -5348,14 +5320,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the number of bytes to be read from the the stream.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a binary stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a binary stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(int,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(int, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5394,14 +5367,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a binary stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a binary stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(int,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(int, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -5439,15 +5413,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="length">he number of bytes to be read from the the stream.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a binary stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a binary stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(java.lang.String,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(java.lang.String, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5486,15 +5460,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a binary stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a binary stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBinaryStream(java.lang.String,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBinaryStream(java.lang.String, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -5531,15 +5505,13 @@
         <Parameter Name="x" Type="Java.Sql.IBlob" />
       </Parameters>
       <Docs>
-        <param name="x">the new value for the specified column.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="inputStream">An object that contains the data to set the parameter
-            value to.</param>
-        <summary>Updates the designated column using the given input stream.</summary>
+        <param name="x">the new column value</param>
+        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(int,%20java.sql.Blob)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(int, java.sql.Blob)</code>.</a>
             </format>
           </para>
           <para>
@@ -5621,16 +5593,13 @@
         <Parameter Name="x" Type="Java.Sql.IBlob" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="x">the new value for the specified column.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="inputStream">An object that contains the data to set the parameter
-            value to.</param>
-        <summary>Updates the designated column using the given input stream.</summary>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="x">the new column value</param>
+        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(java.lang.String,%20java.sql.Blob)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(java.lang.String, java.sql.Blob)</code>.</a>
             </format>
           </para>
           <para>
@@ -5668,15 +5637,14 @@
         <Parameter Name="inputStream" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
         <summary>Updates the designated column using the given input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(java.lang.String, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -5714,15 +5682,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
-        <summary>Updates the designated column using the given input stream.</summary>
+        <param name="length">the number of bytes in the parameter data.</param>
+        <summary>Updates the designated column using the given input stream, which
+            will have the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(int,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(int, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -5760,16 +5729,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
-        <summary>Updates the designated column using the given input stream.</summary>
+        <param name="length">the number of bytes in the parameter data.</param>
+        <summary>Updates the designated column using the given input stream, which
+            will have the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBlob(java.lang.String,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBlob(java.lang.String, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -5850,14 +5819,13 @@
         <Parameter Name="x" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;boolean&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBoolean(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBoolean(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBoolean(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBoolean(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -5939,14 +5907,13 @@
         <Parameter Name="x" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;byte&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateByte(int,%20byte)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateByte(int, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateByte(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateByte(java.lang.String, byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -6028,14 +5995,13 @@
         <Parameter Name="x" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;byte&lt;/code&gt; array value.</summary>
+        <summary>Updates the designated column with a byte array value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBytes(int,%20byte[])" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBytes(int, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateBytes(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateBytes(java.lang.String, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6116,15 +6082,14 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="reader">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="x">the new column value</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+                   the new column value</param>
         <summary>Updates the designated column with a character stream value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -6162,14 +6127,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the length of data to write from the stream</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a character stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a character stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(int,%20java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(int, java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6208,14 +6174,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a character stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a character stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -6253,16 +6220,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="reader">the new value for the specified column.</param>
-        <param name="length">the length of data to write from the Reader</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="x">the new column value</param>
-        <summary>Updates the designated column with a character stream value.</summary>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+                   the new column value</param>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a character stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(java.lang.String,%20java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(java.lang.String, java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6301,16 +6268,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="reader">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="x">the new column value</param>
-        <summary>Updates the designated column with a character stream value.</summary>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+                   the new column value</param>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a character stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateCharacterStream(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateCharacterStream(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -6391,15 +6358,13 @@
         <Parameter Name="x" Type="Java.Sql.IClob" />
       </Parameters>
       <Docs>
-        <param name="x">the new value for the specified column.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+        <param name="x">the new column value</param>
+        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(int,%20java.sql.Clob)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(int, java.sql.Clob)</code>.</a>
             </format>
           </para>
           <para>
@@ -6437,15 +6402,14 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
             object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -6482,16 +6446,13 @@
         <Parameter Name="x" Type="Java.Sql.IClob" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="x">the new value for the specified column.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="x">the new column value</param>
+        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(java.lang.String,%20java.sql.Clob)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(java.lang.String, java.sql.Clob)</code>.</a>
             </format>
           </para>
           <para>
@@ -6530,15 +6491,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -6576,16 +6537,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateClob(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateClob(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -6666,14 +6626,13 @@
         <Parameter Name="x" Type="Java.Sql.Date" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateDate(int,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateDate(int, java.sql.Date)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateDate(java.lang.String,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateDate(java.lang.String, java.sql.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -6755,14 +6714,13 @@
         <Parameter Name="x" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;double&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateDouble(int,%20double)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateDouble(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateDouble(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateDouble(java.lang.String, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -6844,14 +6802,13 @@
         <Parameter Name="x" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a &lt;code&gt;float&lt;/code&gt; value.</summary>
+        <summary>Updates the designated column with a &lt;code&gt;float &lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateFloat(int,%20float)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateFloat(int, float)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateFloat(java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateFloat(java.lang.String, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -6933,14 +6890,13 @@
         <Parameter Name="x" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with an &lt;code&gt;int&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateInt(int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateInt(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateInt(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateInt(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -7022,14 +6978,13 @@
         <Parameter Name="x" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;long&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateLong(int,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateLong(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateLong(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateLong(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -7110,15 +7065,14 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="reader">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="x">the new column value</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+                   the new column value</param>
         <summary>Updates the designated column with a character stream value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNCharacterStream(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNCharacterStream(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -7156,14 +7110,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
-        <summary>Updates the designated column with a character stream value.</summary>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a character stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNCharacterStream(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNCharacterStream(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -7201,16 +7156,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="reader">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
-        <param name="x">the new column value</param>
-        <summary>Updates the designated column with a character stream value.</summary>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object containing
+                   the new column value</param>
+        <param name="length">the length of the stream</param>
+        <summary>Updates the designated column with a character stream value, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNCharacterStream(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNCharacterStream(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -7293,17 +7248,13 @@
         <Parameter Name="nClob" Type="Java.Sql.INClob" />
       </Parameters>
       <Docs>
-        <param name="nClob">To be added.</param>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            
-            The data will be read from the stream
-            as needed until end-of-stream is reached.</summary>
+        <param name="nClob">the value for the column to be updated</param>
+        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(int,%20java.sql.NClob)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(int, java.sql.NClob)</code>.</a>
             </format>
           </para>
           <para>
@@ -7340,17 +7291,14 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            
-            The data will be read from the stream
-            as needed until end-of-stream is reached.</summary>
+            object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -7387,18 +7335,13 @@
         <Parameter Name="nClob" Type="Java.Sql.INClob" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="nClob">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            
-            The data will be read from the stream
-            as needed until end-of-stream is reached.</summary>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="nClob">the value for the column to be updated</param>
+        <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(java.lang.String,%20java.sql.NClob)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(java.lang.String, java.sql.NClob)</code>.</a>
             </format>
           </para>
           <para>
@@ -7436,17 +7379,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">To be added.</param>
         <param name="columnIndex">the first column is 1, the second 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            
-            The data will be read from the stream
-            as needed until end-of-stream is reached.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -7484,18 +7425,15 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="length">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Updates the designated column using the given &lt;code&gt;Reader&lt;/code&gt;
-            
-            The data will be read from the stream
-            as needed until end-of-stream is reached.</summary>
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNClob(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNClob(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -7575,14 +7513,13 @@
         <Parameter Name="nString" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="nString">the value for the column to be updated</param>
         <summary>Updates the designated column with a &lt;code&gt;String&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNString(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNString(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNString(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNString(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -7660,13 +7597,12 @@
         <Parameter Name="columnLabel" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <summary>Updates the designated column with a &lt;code&gt;null&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNull(int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNull(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateNull(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateNull(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -7748,14 +7684,13 @@
         <Parameter Name="x" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with an &lt;code&gt;Object&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateObject(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateObject(java.lang.String, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -7794,14 +7729,19 @@
         <Parameter Name="scaleOrLength" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="scaleOrLength">To be added.</param>
         <param name="columnIndex">the first column is 1, the second is 2, ...</param>
         <param name="x">the new column value</param>
+        <param name="scaleOrLength">for an object of &lt;code&gt;java.math.BigDecimal&lt;/code&gt; ,
+                     this is the number of digits after the decimal point. For
+                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     this is the length
+                     of the data in the stream or reader.  For all other types,
+                     this value will be ignored.</param>
         <summary>Updates the designated column with an &lt;code&gt;Object&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateObject(int,%20java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateObject(int, java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -7840,15 +7780,19 @@
         <Parameter Name="scaleOrLength" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="scaleOrLength">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
+        <param name="scaleOrLength">for an object of &lt;code&gt;java.math.BigDecimal&lt;/code&gt; ,
+                     this is the number of digits after the decimal point. For
+                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     this is the length
+                     of the data in the stream or reader.  For all other types,
+                     this value will be ignored.</param>
         <summary>Updates the designated column with an &lt;code&gt;Object&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateObject(java.lang.String,%20java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateObject(java.lang.String, java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -7930,14 +7874,13 @@
         <Parameter Name="x" Type="Java.Sql.IRef" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateRef(int,%20java.sql.Ref)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateRef(int, java.sql.Ref)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateRef(java.lang.String,%20java.sql.Ref)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateRef(java.lang.String, java.sql.Ref)</code>.</a>
             </format>
           </para>
           <para>
@@ -8058,14 +8001,13 @@
         <Parameter Name="x" Type="Java.Sql.IRowId" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the column value</param>
         <summary>Updates the designated column with a &lt;code&gt;RowId&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateRowId(int,%20java.sql.RowId)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateRowId(int, java.sql.RowId)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateRowId(java.lang.String,%20java.sql.RowId)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateRowId(java.lang.String, java.sql.RowId)</code>.</a>
             </format>
           </para>
           <para>
@@ -8146,14 +8088,13 @@
         <Parameter Name="x" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;short&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateShort(int,%20short)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateShort(int, short)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateShort(java.lang.String,%20short)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateShort(java.lang.String, short)</code>.</a>
             </format>
           </para>
           <para>
@@ -8234,14 +8175,13 @@
         <Parameter Name="xmlObject" Type="Java.Sql.ISQLXML" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second 2, ...</param>
-        <param name="xmlObject">the value for the column to be updated</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
+        <param name="xmlObject">the column value</param>
         <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateSQLXML(int,%20java.sql.SQLXML)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateSQLXML(int, java.sql.SQLXML)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateSQLXML(java.lang.String,%20java.sql.SQLXML)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateSQLXML(java.lang.String, java.sql.SQLXML)</code>.</a>
             </format>
           </para>
           <para>
@@ -8322,14 +8262,13 @@
         <Parameter Name="x" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;String&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateString(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateString(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateString(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateString(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -8411,14 +8350,13 @@
         <Parameter Name="x" Type="Java.Sql.Time" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateTime(int,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateTime(int, java.sql.Time)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateTime(java.lang.String,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateTime(java.lang.String, java.sql.Time)</code>.</a>
             </format>
           </para>
           <para>
@@ -8500,14 +8438,13 @@
         <Parameter Name="x" Type="Java.Sql.Timestamp" />
       </Parameters>
       <Docs>
-        <param name="columnLabel">To be added.</param>
-        <param name="columnIndex">the first column is 1, the second is 2, ...</param>
+        <param name="columnLabel">the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column</param>
         <param name="x">the new column value</param>
         <summary>Updates the designated column with a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateTimestamp(int,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateTimestamp(int, java.sql.Timestamp)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/ResultSet#updateTimestamp(java.lang.String,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>java.sql.ResultSet.updateTimestamp(java.lang.String, java.sql.Timestamp)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IStatement.xml b/docs/Mono.Android/en/Java.Sql/IStatement.xml
index 499c56d9a5..891c2055cc 100644
--- a/docs/Mono.Android/en/Java.Sql/IStatement.xml
+++ b/docs/Mono.Android/en/Java.Sql/IStatement.xml
@@ -426,17 +426,23 @@
         <Parameter Name="autoGeneratedKeys" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="autoGeneratedKeys">a flag indicating whether to make auto generated keys
-            available for retrieval. This parameter must be one of <c>Statement.NO_GENERATED_KEYS</c> or <c>Statement.RETURN_GENERATED_KEYS</c>.</param>
         <param name="sql">any SQL statement</param>
-        <summary>Executes the given SQL statement, which may return multiple results.</summary>
+        <param name="autoGeneratedKeys">a constant indicating whether auto-generated
+                   keys should be made available for retrieval using the method
+                   &lt;code&gt;getGeneratedKeys&lt;/code&gt;; one of the following constants:
+                   &lt;code&gt;Statement.RETURN_GENERATED_KEYS&lt;/code&gt; or
+                   &lt;code&gt;Statement.NO_GENERATED_KEYS&lt;/code&gt;</param>
+        <summary>Executes the given SQL statement, which may return multiple results,
+            and signals the driver that any
+            auto-generated keys should be made available
+            for retrieval.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if the first result is a &lt;code&gt;ResultSet&lt;/code&gt;
                     object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are
                     no results</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Statement#execute(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Statement.execute(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Statement#execute(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Statement.execute(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -474,17 +480,21 @@
         <Parameter Name="columnIndexes" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="columnIndexes">an array of indexes of the columns in the inserted row which
-            should be made available for retrieval via the <c>getGeneratedKeys</c> method.</param>
         <param name="sql">any SQL statement</param>
-        <summary>Executes the given SQL statement, which may return multiple results.</summary>
+        <param name="columnIndexes">an array of the indexes of the columns in the
+                   inserted row that should be  made available for retrieval by a
+                   call to the method &lt;code&gt;getGeneratedKeys&lt;/code&gt;</param>
+        <summary>Executes the given SQL statement, which may return multiple results,
+            and signals the driver that the
+            auto-generated keys indicated in the given array should be made available
+            for retrieval.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if the first result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are
-                    no results</returns>
+                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there
+                    are no results</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Statement#execute(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Statement.execute(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Statement#execute(java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>java.sql.Statement.execute(java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -522,18 +532,21 @@
         <Parameter Name="columnNames" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="columnNames">an array of column names in the inserted row which should be
-            made available for retrieval via the <c>getGeneratedKeys</c>
-            method.</param>
         <param name="sql">any SQL statement</param>
-        <summary>Executes the given SQL statement, which may return multiple results.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the first result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are
-                    no results</returns>
+        <param name="columnNames">an array of the names of the columns in the inserted
+                   row that should be made available for retrieval by a call to the
+                   method &lt;code&gt;getGeneratedKeys&lt;/code&gt;</param>
+        <summary>Executes the given SQL statement, which may return multiple results,
+            and signals the driver that the
+            auto-generated keys indicated in the given array should be made available
+            for retrieval.</summary>
+        <returns>&lt;code&gt;true&lt;/code&gt; if the next result is a &lt;code&gt;ResultSet&lt;/code&gt;
+                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there
+                    are no more results</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Statement#execute(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Statement.execute(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Statement#execute(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>java.sql.Statement.execute(java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -747,20 +760,24 @@
         <Parameter Name="autoGeneratedKeys" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="autoGeneratedKeys">a flag that indicates whether to allow retrieval of auto
-            generated keys. Parameter must be one of <c>Statement.RETURN_GENERATED_KEYS</c> or <c>Statement.NO_GENERATED_KEYS</c></param>
         <param name="sql">an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
             &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
             such as a DDL statement.</param>
-        <summary>Executes the given SQL statement, which may be an &lt;code&gt;INSERT&lt;/code&gt;,
-            &lt;code&gt;UPDATE&lt;/code&gt;, or &lt;code&gt;DELETE&lt;/code&gt; statement or an
-            SQL statement that returns nothing, such as an SQL DDL statement.</summary>
+        <param name="autoGeneratedKeys">a flag indicating whether auto-generated keys
+                   should be made available for retrieval;
+                    one of the following constants:
+                    &lt;code&gt;Statement.RETURN_GENERATED_KEYS&lt;/code&gt;
+                    &lt;code&gt;Statement.NO_GENERATED_KEYS&lt;/code&gt;</param>
+        <summary>Executes the given SQL statement and signals the driver with the
+            given flag about whether the
+            auto-generated keys produced by this &lt;code&gt;Statement&lt;/code&gt; object
+            should be made available for retrieval.</summary>
         <returns>either (1) the row count for SQL Data Manipulation Language (DML) statements
                     or (2) 0 for SQL statements that return nothing</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Statement#executeUpdate(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Statement.executeUpdate(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Statement#executeUpdate(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Statement.executeUpdate(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -799,20 +816,20 @@
         <Parameter Name="columnIndexes" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="columnIndexes">an array of indexes of the columns in the inserted row which
-            should be made available for retrieval via the <c>getGeneratedKeys</c> method.</param>
         <param name="sql">an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
             &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
             such as a DDL statement.</param>
-        <summary>Executes the given SQL statement, which may be an &lt;code&gt;INSERT&lt;/code&gt;,
-            &lt;code&gt;UPDATE&lt;/code&gt;, or &lt;code&gt;DELETE&lt;/code&gt; statement or an
-            SQL statement that returns nothing, such as an SQL DDL statement.</summary>
+        <param name="columnIndexes">an array of column indexes indicating the columns
+                   that should be returned from the inserted row</param>
+        <summary>Executes the given SQL statement and signals the driver that the
+            auto-generated keys indicated in the given array should be made available
+            for retrieval.</summary>
         <returns>either (1) the row count for SQL Data Manipulation Language (DML) statements
                     or (2) 0 for SQL statements that return nothing</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Statement#executeUpdate(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Statement.executeUpdate(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Statement#executeUpdate(java.lang.String,%20int[])" title="Reference documentation">Java documentation for <code>java.sql.Statement.executeUpdate(java.lang.String, int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -851,21 +868,21 @@
         <Parameter Name="columnNames" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="columnNames">an array of column names in the inserted row which should be
-            made available for retrieval via the <c>getGeneratedKeys</c>
-            method.</param>
         <param name="sql">an SQL Data Manipulation Language (DML) statement, such as &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt; or
             &lt;code&gt;DELETE&lt;/code&gt;; or an SQL statement that returns nothing,
             such as a DDL statement.</param>
-        <summary>Executes the given SQL statement, which may be an &lt;code&gt;INSERT&lt;/code&gt;,
-            &lt;code&gt;UPDATE&lt;/code&gt;, or &lt;code&gt;DELETE&lt;/code&gt; statement or an
-            SQL statement that returns nothing, such as an SQL DDL statement.</summary>
-        <returns>either (1) the row count for SQL Data Manipulation Language (DML) statements
-                    or (2) 0 for SQL statements that return nothing</returns>
+        <param name="columnNames">an array of the names of the columns that should be
+                   returned from the inserted row</param>
+        <summary>Executes the given SQL statement and signals the driver that the
+            auto-generated keys indicated in the given array should be made available
+            for retrieval.</summary>
+        <returns>either the row count for &lt;code&gt;INSERT&lt;/code&gt;, &lt;code&gt;UPDATE&lt;/code&gt;,
+                    or &lt;code&gt;DELETE&lt;/code&gt; statements, or 0 for SQL statements
+                    that return nothing</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Statement#executeUpdate(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.Statement.executeUpdate(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Statement#executeUpdate(java.lang.String,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>java.sql.Statement.executeUpdate(java.lang.String, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1009,19 +1026,24 @@
         <Parameter Name="current" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="current">a flag indicating what to do with existing <c>ResultSet</c>s.
-            This parameter must be one of <c>Statement.CLOSE_ALL_RESULTS</c>, <c>Statement.CLOSE_CURRENT_RESULT</c> or <c>Statement.KEEP_CURRENT_RESULT</c>.</param>
-        <summary>Moves to this &lt;code&gt;Statement&lt;/code&gt; object's next result, returns
-            &lt;code&gt;true&lt;/code&gt; if it is a &lt;code&gt;ResultSet&lt;/code&gt; object, and
-            implicitly closes any current &lt;code&gt;ResultSet&lt;/code&gt;
-            object(s) obtained with the method &lt;code&gt;getResultSet&lt;/code&gt;.</summary>
+        <param name="current">one of the following &lt;code&gt;Statement&lt;/code&gt;
+                   constants indicating what should happen to current
+                   &lt;code&gt;ResultSet&lt;/code&gt; objects obtained using the method
+                   &lt;code&gt;getResultSet&lt;/code&gt;:
+                   &lt;code&gt;Statement.CLOSE_CURRENT_RESULT&lt;/code&gt;,
+                   &lt;code&gt;Statement.KEEP_CURRENT_RESULT&lt;/code&gt;, or
+                   &lt;code&gt;Statement.CLOSE_ALL_RESULTS&lt;/code&gt;</param>
+        <summary>Moves to this &lt;code&gt;Statement&lt;/code&gt; object's next result, deals with
+            any current &lt;code&gt;ResultSet&lt;/code&gt; object(s) according  to the instructions
+            specified by the given flag, and returns
+            &lt;code&gt;true&lt;/code&gt; if the next result is a &lt;code&gt;ResultSet&lt;/code&gt; object.</summary>
         <returns>&lt;code&gt;true&lt;/code&gt; if the next result is a &lt;code&gt;ResultSet&lt;/code&gt;
-                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are
-                    no more results</returns>
+                    object; &lt;code&gt;false&lt;/code&gt; if it is an update count or there are no
+                    more results</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Statement#getMoreResults()" title="Reference documentation">Java documentation for <code>java.sql.Statement.getMoreResults()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Statement#getMoreResults(int)" title="Reference documentation">Java documentation for <code>java.sql.Statement.getMoreResults(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/IStruct.xml b/docs/Mono.Android/en/Java.Sql/IStruct.xml
index 94269697e6..1fe7fd615f 100644
--- a/docs/Mono.Android/en/Java.Sql/IStruct.xml
+++ b/docs/Mono.Android/en/Java.Sql/IStruct.xml
@@ -106,14 +106,14 @@
         <Parameter Name="map" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Lang.Class&gt;" />
       </Parameters>
       <Docs>
-        <param name="map">To be added.</param>
+        <param name="map">a mapping of SQL type names to Java classes</param>
         <summary>Produces the ordered values of the attributes of the SQL
             structured type that this &lt;code&gt;Struct&lt;/code&gt; object represents.</summary>
         <returns>an array containing the ordered attribute values</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Struct#getAttributes()" title="Reference documentation">Java documentation for <code>java.sql.Struct.getAttributes()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Struct#getAttributes(java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.Struct.getAttributes(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml b/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml
index 2fc4f270ec..0e628af9d8 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLClientInfoException.xml
@@ -88,12 +88,19 @@
         <Parameter Name="failedProperties" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Sql.ClientInfoStatus&gt;" />
       </Parameters>
       <Docs>
-        <param name="failedProperties">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
+            given &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,13 +132,21 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="failedProperties">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
+        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with
+            a given &lt;code&gt;cause&lt;/code&gt; and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.util.Map,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.util.Map, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +201,20 @@
         <Parameter Name="failedProperties" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Sql.ClientInfoStatus&gt;" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="failedProperties">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
+            given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,14 +247,23 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="failedProperties">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
+            given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;cause&lt;/code&gt; and
+            &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.lang.String,%20java.util.Map,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.lang.String, java.util.Map, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +296,22 @@
         <Parameter Name="failedProperties" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Sql.ClientInfoStatus&gt;" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="failedProperties">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
+            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.lang.String,%20java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,15 +345,24 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="failedProperties">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
+            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;cause&lt;/code&gt;
+            and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.lang.String,%20java.lang.String,%20java.util.Map,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +396,23 @@
         <Parameter Name="failedProperties" Type="System.Collections.Generic.IDictionary&lt;System.String,Java.Sql.ClientInfoStatus&gt;" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="failedProperties">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
+            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;,
+            &lt;code&gt;vendorCode&lt;/code&gt;  and &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.lang.String,%20java.lang.String,%20int,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -391,16 +447,26 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="failedProperties">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt;  Object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="failedProperties">A Map containing the property values that could not
+                                             be set.  The keys in the Map
+                                             contain the names of the client info
+                                             properties that could not be set and
+                                             the values contain one of the reason codes
+                                             defined in &lt;code&gt;ClientInfoStatus&lt;/code&gt;</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.
+            &lt;p&gt;</param>
+        <summary>Constructs a &lt;code&gt;SQLClientInfoException&lt;/code&gt; object initialized with a
+            given  &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;,
+            &lt;code&gt;cause&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt; and
+            &lt;code&gt;failedProperties&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException()" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLClientInfoException#SQLClientInfoException(java.lang.String,%20java.lang.String,%20int,%20java.util.Map,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLClientInfoException.SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLDataException.xml b/docs/Mono.Android/en/Java.Sql/SQLDataException.xml
index a4c413f46a..c702bb03e9 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLDataException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLDataException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
+            &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException()" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException()" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException()" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,13 +230,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException()" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +271,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException()" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +314,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException()" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +358,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLDataException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException()" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLDataException#SQLDataException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLDataException.SQLDataException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLException.xml b/docs/Mono.Android/en/Java.Sql/SQLException.xml
index e9e678e43e..1cccbea923 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLException.xml
@@ -104,12 +104,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
+            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
+            &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException()" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,12 +144,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException()" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,13 +206,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
+            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException()" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -241,13 +248,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException()" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -281,14 +289,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="sqlState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="sqlState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
+            (which is saved for later retrieval by the
+            &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException()" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -322,14 +334,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException()" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -364,15 +378,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="sqlState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="sqlState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;
+            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLException&lt;/code&gt; object with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException()" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLException#SQLException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLException.SQLException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml b/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml
index c077558f86..95d71f2207 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLFeatureNotSupportedException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval bythe &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+              with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException()" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException()" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException()" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,13 +231,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException()" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +272,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException()" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +316,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException()" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +360,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLFeatureNotSupportedException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException()" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException#SQLFeatureNotSupportedException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLFeatureNotSupportedException.SQLFeatureNotSupportedException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml b/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml
index 6fbd7d8775..c203bc945c 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLIntegrityConstraintViolationException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt;  method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs an &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object with
+             a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException()" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt;
+             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException()" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException()" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,13 +231,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt;
+            object with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException()" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +272,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt;  method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
+             with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException()" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +316,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException()" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +360,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLIntegrityConstraintViolationException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException()" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException#SQLIntegrityConstraintViolationException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLIntegrityConstraintViolationException.SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml b/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml
index 6ce9bd9139..3d12e9ebe1 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLInvalidAuthorizationSpecException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException()" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException()" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+             with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException()" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,13 +231,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException()" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +272,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt;  method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+             with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException()" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +316,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException()" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +360,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLInvalidAuthorizationSpecException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException()" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException#SQLInvalidAuthorizationSpecException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLInvalidAuthorizationSpecException.SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml b/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml
index 7b89995ac4..971b573738 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLNonTransientConnectionException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,13 +231,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +272,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +316,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +360,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientConnectionException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException#SQLNonTransientConnectionException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientConnectionException.SQLNonTransientConnectionException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml b/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml
index 0b9f92579a..68e98d162f 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLNonTransientException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+             with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,13 +231,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +272,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +316,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +360,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLNonTransientException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLNonTransientException#SQLNonTransientException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLNonTransientException.SQLNonTransientException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml b/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml
index 6f2cc0b5e0..5d06962789 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLRecoverableException.xml
@@ -89,12 +89,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException()" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,12 +128,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException()" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,13 +190,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException()" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -226,13 +232,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException()" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -266,14 +273,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException()" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -307,14 +317,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException()" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -349,15 +361,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLRecoverableException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException()" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLRecoverableException#SQLRecoverableException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLRecoverableException.SQLRecoverableException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml b/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml
index 26d832ce14..ad608109ea 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLSyntaxErrorException.xml
@@ -87,12 +87,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval bythe &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+              with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException()" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +126,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException()" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +188,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException()" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -224,13 +230,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException()" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -264,14 +271,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException()" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -305,14 +315,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException()" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -347,15 +359,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLSyntaxErrorException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException()" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException#SQLSyntaxErrorException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLSyntaxErrorException.SQLSyntaxErrorException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml b/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml
index c22e7c4447..09e874c66f 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTimeoutException.xml
@@ -87,12 +87,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +126,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +188,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -224,13 +230,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -264,14 +271,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+             with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -305,14 +315,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -347,15 +359,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTimeoutException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTimeoutException#SQLTimeoutException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTimeoutException.SQLTimeoutException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml b/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml
index d42249632e..730dcd7839 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTransactionRollbackException.xml
@@ -87,12 +87,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +126,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +188,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -224,13 +230,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -264,14 +271,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -305,14 +315,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -347,15 +359,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransactionRollbackException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException#SQLTransactionRollbackException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransactionRollbackException.SQLTransactionRollbackException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml b/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml
index 8f6ab3e551..bc757e981b 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTransientConnectionException.xml
@@ -87,12 +87,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +126,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +188,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt;(which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -224,13 +230,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -264,14 +271,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -305,14 +315,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -347,15 +359,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientConnectionException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException#SQLTransientConnectionException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientConnectionException.SQLTransientConnectionException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml b/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml
index b686339b06..923dff37ed 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLTransientException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -225,13 +231,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -265,14 +272,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception.</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -306,14 +316,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor specific exception code</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +360,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the exception</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the exception</param>
+        <param name="vendorCode">a database vendor-specific exception code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLException&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLTransientException&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException()" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLTransientException#SQLTransientException(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLTransientException.SQLTransientException(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/SQLWarning.xml b/docs/Mono.Android/en/Java.Sql/SQLWarning.xml
index a555427125..5706106672 100644
--- a/docs/Mono.Android/en/Java.Sql/SQLWarning.xml
+++ b/docs/Mono.Android/en/Java.Sql/SQLWarning.xml
@@ -101,12 +101,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
+            with a given  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning()" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,12 +140,13 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the warning</param>
+        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning()" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning(java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -199,13 +202,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the warning</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt;
+            (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method);
+            may be null indicating the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning()" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -238,13 +245,14 @@
         <Parameter Name="SQLState" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the warning</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
+        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
+            with a given &lt;code&gt;reason&lt;/code&gt; and &lt;code&gt;SQLState&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning()" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -278,14 +286,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the warning</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a &lt;code&gt;SQLWarning&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt; and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning()" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning(java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning(java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -319,14 +330,16 @@
         <Parameter Name="vendorCode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the warning</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
+        <param name="vendorCode">a database vendor-specific warning code</param>
+        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object
+             with a given &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;  and
+            &lt;code&gt;vendorCode&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning()" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning(java.lang.String,%20java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning(java.lang.String, java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -361,15 +374,19 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="reason">To be added.</param>
-        <param name="SQLState">To be added.</param>
-        <param name="vendorCode">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a  &lt;code&gt;SQLWarning&lt;/code&gt; object.</summary>
+        <param name="reason">a description of the warning</param>
+        <param name="SQLState">an XOPEN or SQL:2003 code identifying the warning</param>
+        <param name="vendorCode">a database vendor-specific warning code</param>
+        <param name="cause">the underlying reason for this &lt;code&gt;SQLWarning&lt;/code&gt; (which is saved for later retrieval by the &lt;code&gt;getCause()&lt;/code&gt; method); may be null indicating
+                the cause is non-existent or unknown.</param>
+        <summary>Constructs a&lt;code&gt;SQLWarning&lt;/code&gt; object
+            with a given
+            &lt;code&gt;reason&lt;/code&gt;, &lt;code&gt;SQLState&lt;/code&gt;, &lt;code&gt;vendorCode&lt;/code&gt;
+            and  &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning()" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning()</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/SQLWarning#SQLWarning(java.lang.String,%20java.lang.String,%20int,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.sql.SQLWarning.SQLWarning(java.lang.String, java.lang.String, int, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/Time.xml b/docs/Mono.Android/en/Java.Sql/Time.xml
index 3c983d5e56..7470e5c1e8 100644
--- a/docs/Mono.Android/en/Java.Sql/Time.xml
+++ b/docs/Mono.Android/en/Java.Sql/Time.xml
@@ -54,16 +54,14 @@
         <Parameter Name="time" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
-        <param name="hour">0 to 23</param>
-        <param name="minute">0 to 59</param>
-        <param name="second">0 to 59</param>
-        <summary>Constructs a &lt;code&gt;Time&lt;/code&gt; object initialized with the
-            given values for the hour, minute, and second.</summary>
+        <param name="time">milliseconds since January 1, 1970, 00:00:00 GMT;
+                        a negative number is milliseconds before
+                          January 1, 1970, 00:00:00 GMT</param>
+        <summary>Constructs a &lt;code&gt;Time&lt;/code&gt; object using a milliseconds time value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Time#Time(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Time.Time(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Time#Time(long)" title="Reference documentation">Java documentation for <code>java.sql.Time.Time(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Sql/Timestamp.xml b/docs/Mono.Android/en/Java.Sql/Timestamp.xml
index 5d45d27e80..a029fd7127 100644
--- a/docs/Mono.Android/en/Java.Sql/Timestamp.xml
+++ b/docs/Mono.Android/en/Java.Sql/Timestamp.xml
@@ -54,20 +54,15 @@
         <Parameter Name="time" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
-        <param name="year">the year minus 1900</param>
-        <param name="month">0 to 11</param>
-        <param name="date">1 to 31</param>
-        <param name="hour">0 to 23</param>
-        <param name="minute">0 to 59</param>
-        <param name="second">0 to 59</param>
-        <param name="nano">0 to 999,999,999</param>
-        <summary>Constructs a &lt;code&gt;Timestamp&lt;/code&gt; object initialized
-            with the given values.</summary>
+        <param name="time">milliseconds since January 1, 1970, 00:00:00 GMT.
+                   A negative number is the number of milliseconds before
+                    January 1, 1970, 00:00:00 GMT.</param>
+        <summary>Constructs a &lt;code&gt;Timestamp&lt;/code&gt; object
+            using a milliseconds time value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Timestamp#Timestamp(int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.sql.Timestamp.Timestamp(int, int, int, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Timestamp#Timestamp(long)" title="Reference documentation">Java documentation for <code>java.sql.Timestamp.Timestamp(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -314,17 +309,16 @@
         <Parameter Name="ts" Type="Java.Sql.Timestamp" />
       </Parameters>
       <Docs>
-        <param name="ts">the &lt;code&gt;Object&lt;/code&gt; value to compare with</param>
+        <param name="ts">the &lt;code&gt;Timestamp&lt;/code&gt; value to compare with</param>
         <summary>Tests to see if this &lt;code&gt;Timestamp&lt;/code&gt; object is
-            equal to the given object.</summary>
-        <returns>&lt;code&gt;true&lt;/code&gt; if the given &lt;code&gt;Object&lt;/code&gt; is an instance
-                    of a &lt;code&gt;Timestamp&lt;/code&gt; that
-                    is equal to this &lt;code&gt;Timestamp&lt;/code&gt; object;
+            equal to the given &lt;code&gt;Timestamp&lt;/code&gt; object.</summary>
+        <returns>&lt;code&gt;true&lt;/code&gt; if the given &lt;code&gt;Timestamp&lt;/code&gt;
+                    object is equal to this &lt;code&gt;Timestamp&lt;/code&gt; object;
                     &lt;code&gt;false&lt;/code&gt; otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/sql/Timestamp#equals(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.sql.Timestamp.equals(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/sql/Timestamp#equals(java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>java.sql.Timestamp.equals(java.sql.Timestamp)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/AttributedString.xml b/docs/Mono.Android/en/Java.Text/AttributedString.xml
index 49036ebf6e..628178e0a5 100644
--- a/docs/Mono.Android/en/Java.Text/AttributedString.xml
+++ b/docs/Mono.Android/en/Java.Text/AttributedString.xml
@@ -55,11 +55,12 @@
       </Parameters>
       <Docs>
         <param name="text">The text for this attributed string.</param>
-        <summary>Constructs an AttributedString instance with the given text.</summary>
+        <summary>Constructs an AttributedString instance with the given attributed
+            text represented by AttributedCharacterIterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/AttributedString#AttributedString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.AttributedString.AttributedString(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/AttributedString#AttributedString(java.text.AttributedCharacterIterator)" title="Reference documentation">Java documentation for <code>java.text.AttributedString.AttributedString(java.text.AttributedCharacterIterator)</code>.</a>
             </format>
           </para>
           <para>
@@ -152,13 +153,13 @@
         <Parameter Name="attributes" Type="System.Collections.Generic.IDictionary&lt;Java.Text.AttributedCharacterIteratorAttribute,System.Object&gt;" />
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
         <param name="text">The text for this attributed string.</param>
-        <summary>Constructs an AttributedString instance with the given text.</summary>
+        <param name="attributes">The attributes that apply to the entire string.</param>
+        <summary>Constructs an AttributedString instance with the given text and attributes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/AttributedString#AttributedString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.AttributedString.AttributedString(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/AttributedString#AttributedString(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>java.text.AttributedString.AttributedString(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -191,14 +192,17 @@
         <Parameter Name="endIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="beginIndex">To be added.</param>
-        <param name="endIndex">To be added.</param>
         <param name="text">The text for this attributed string.</param>
-        <summary>Constructs an AttributedString instance with the given text.</summary>
+        <param name="beginIndex">Index of the first character of the range.</param>
+        <param name="endIndex">Index of the character following the last character
+            of the range.</param>
+        <summary>Constructs an AttributedString instance with the subrange of
+            the given attributed text represented by
+            AttributedCharacterIterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/AttributedString#AttributedString(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.AttributedString.AttributedString(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/AttributedString#AttributedString(java.text.AttributedCharacterIterator,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.text.AttributedString.AttributedString(java.text.AttributedCharacterIterator, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -237,10 +241,10 @@
         <Parameter Name="attributes" Type="Java.Text.AttributedCharacterIteratorAttribute[]" />
       </Parameters>
       <Docs>
+        <param name="text">The text for this attributed string.</param>
         <param name="beginIndex">To be added.</param>
         <param name="endIndex">To be added.</param>
         <param name="attributes">To be added.</param>
-        <param name="text">The text for this attributed string.</param>
         <summary>Constructs an AttributedString instance with the given text.</summary>
         <remarks>
           <para>
@@ -332,10 +336,10 @@
         <Parameter Name="endIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="beginIndex">To be added.</param>
-        <param name="endIndex">To be added.</param>
         <param name="attribute">the attribute key</param>
         <param name="value">the value of the attribute; may be null</param>
+        <param name="beginIndex">To be added.</param>
+        <param name="endIndex">To be added.</param>
         <summary>Adds an attribute to the entire string.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/Bidi.xml b/docs/Mono.Android/en/Java.Text/Bidi.xml
index 89d74ae3d9..278beed530 100644
--- a/docs/Mono.Android/en/Java.Text/Bidi.xml
+++ b/docs/Mono.Android/en/Java.Text/Bidi.xml
@@ -54,16 +54,12 @@
         <Parameter Name="paragraph" Type="Java.Text.IAttributedCharacterIterator" />
       </Parameters>
       <Docs>
-        <param name="paragraph">a paragraph of text</param>
-        <param name="flags">a collection of flags that control the algorithm.  The
-            algorithm understands the flags DIRECTION_LEFT_TO_RIGHT, DIRECTION_RIGHT_TO_LEFT,
-            DIRECTION_DEFAULT_LEFT_TO_RIGHT, and DIRECTION_DEFAULT_RIGHT_TO_LEFT.
-            Other values are reserved.</param>
-        <summary>Create Bidi from the given paragraph of text and base direction.</summary>
+        <param name="paragraph">a paragraph of text with optional character and paragraph attribute information</param>
+        <summary>Create Bidi from the given paragraph of text.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/Bidi#Bidi(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.text.Bidi.Bidi(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/Bidi#Bidi(java.text.AttributedCharacterIterator)" title="Reference documentation">Java documentation for <code>java.text.Bidi.Bidi(java.text.AttributedCharacterIterator)</code>.</a>
             </format>
           </para>
           <para>
@@ -150,21 +146,21 @@
         <Parameter Name="flags" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <param name="textStart">To be added.</param>
-        <param name="embeddings">To be added.</param>
-        <param name="embStart">To be added.</param>
-        <param name="paragraphLength">To be added.</param>
-        <param name="paragraph">a paragraph of text</param>
+        <param name="text">an array containing the paragraph of text to process.</param>
+        <param name="textStart">the index into the text array of the start of the paragraph.</param>
+        <param name="embeddings">an array containing embedding values for each character in the paragraph.
+            This can be null, in which case it is assumed that there is no external embedding information.</param>
+        <param name="embStart">the index into the embedding array of the start of the paragraph.</param>
+        <param name="paragraphLength">the length of the paragraph in the text and embeddings arrays.</param>
         <param name="flags">a collection of flags that control the algorithm.  The
             algorithm understands the flags DIRECTION_LEFT_TO_RIGHT, DIRECTION_RIGHT_TO_LEFT,
             DIRECTION_DEFAULT_LEFT_TO_RIGHT, and DIRECTION_DEFAULT_RIGHT_TO_LEFT.
             Other values are reserved.</param>
-        <summary>Create Bidi from the given paragraph of text and base direction.</summary>
+        <summary>Create Bidi from the given text, embedding, and direction information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/Bidi#Bidi(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.text.Bidi.Bidi(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/Bidi#Bidi(char[],%20int,%20byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.text.Bidi.Bidi(char[], int, byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/BreakIterator.xml b/docs/Mono.Android/en/Java.Text/BreakIterator.xml
index 964ecb4064..a8665c1674 100644
--- a/docs/Mono.Android/en/Java.Text/BreakIterator.xml
+++ b/docs/Mono.Android/en/Java.Text/BreakIterator.xml
@@ -407,14 +407,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the given locale.</param>
+        <param name="locale">the desired locale</param>
         <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
             for &lt;a href="BreakIterator.</summary>
         <returns>A break iterator for character breaks</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/BreakIterator#getCharacterInstance()" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getCharacterInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/BreakIterator#getCharacterInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getCharacterInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -449,14 +449,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the given locale.</param>
+        <param name="locale">the desired locale</param>
         <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
             for &lt;a href="BreakIterator.</summary>
         <returns>A break iterator for line breaks</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/BreakIterator#getLineInstance()" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getLineInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/BreakIterator#getLineInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getLineInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -493,14 +493,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the given locale.</param>
+        <param name="locale">the desired locale</param>
         <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
             for &lt;a href="BreakIterator.</summary>
         <returns>A break iterator for sentence breaks</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/BreakIterator#getSentenceInstance()" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getSentenceInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/BreakIterator#getSentenceInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getSentenceInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -537,14 +537,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the given locale.</param>
+        <param name="locale">the desired locale</param>
         <summary>Returns a new &lt;code&gt;BreakIterator&lt;/code&gt; instance
             for &lt;a href="BreakIterator.</summary>
         <returns>A break iterator for word breaks</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/BreakIterator#getWordInstance()" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getWordInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/BreakIterator#getWordInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.getWordInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -774,16 +774,17 @@
         <Parameter Name="n" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="n">the given position.</param>
-        <summary>Returns the boundary following the current boundary.</summary>
-        <returns>The character index of the next text boundary or
-            &lt;code&gt;BreakIterator.DONE&lt;/code&gt; if the current boundary is the last text
-            boundary.
-            Equivalent to next(1).</returns>
+        <param name="n">which boundary to return.  A value of 0
+            does nothing.  Negative values move to previous boundaries
+            and positive values move to later boundaries.</param>
+        <summary>Returns the nth boundary from the current boundary.</summary>
+        <returns>The character index of the nth boundary from the current position
+            or &lt;code&gt;BreakIterator.DONE&lt;/code&gt; if either first or last text boundary
+            has been reached.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/BreakIterator#next()" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.next()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/BreakIterator#next(int)" title="Reference documentation">Java documentation for <code>java.text.BreakIterator.next(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml b/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml
index 9743fd4711..0da7bf525f 100644
--- a/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/ChoiceFormat.xml
@@ -90,14 +90,13 @@
         <Parameter Name="formats" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="limits">To be added.</param>
-        <param name="formats">To be added.</param>
-        <param name="newPattern">the new pattern string</param>
-        <summary>Constructs with limits and corresponding formats based on the pattern.</summary>
+        <param name="limits">limits in ascending order</param>
+        <param name="formats">corresponding format strings</param>
+        <summary>Constructs with the limits and the corresponding formats.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/ChoiceFormat#ChoiceFormat(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.ChoiceFormat.ChoiceFormat(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/ChoiceFormat#ChoiceFormat(double[],%20java.lang.String[])" title="Reference documentation">Java documentation for <code>java.text.ChoiceFormat.ChoiceFormat(double[], java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -247,12 +246,12 @@
         <param name="number">number to be formatted and substituted.</param>
         <param name="toAppendTo">where text is appended.</param>
         <param name="status">ignore no useful status is returned.</param>
-        <summary>Returns pattern with formatted double.</summary>
+        <summary>Specialization of format.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/ChoiceFormat#format(double,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.ChoiceFormat.format(double, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/ChoiceFormat#format(long,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.ChoiceFormat.format(long, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
@@ -438,14 +437,18 @@
         <Parameter Name="positive" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="positive">To be added.</param>
         <param name="d">the reference value</param>
-        <summary>Finds the least double greater than <c>d</c>.</summary>
-        <returns>the least double value greather than <c>d</c></returns>
+        <param name="positive">
+          <c>true</c> if the least double is desired;
+                            <c>false</c> otherwise</param>
+        <summary>Finds the least double greater than <c>d</c> (if <c>positive</c> is
+            <c>true</c>), or the greatest double less than <c>d</c> (if
+            <c>positive</c> is <c>false</c>).</summary>
+        <returns>the least or greater double value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/ChoiceFormat#nextDouble(double)" title="Reference documentation">Java documentation for <code>java.text.ChoiceFormat.nextDouble(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/ChoiceFormat#nextDouble(double,%20boolean)" title="Reference documentation">Java documentation for <code>java.text.ChoiceFormat.nextDouble(double, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml b/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml
index 05656cbb02..356880d6c4 100644
--- a/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml
+++ b/docs/Mono.Android/en/Java.Text/CollationElementIterator.xml
@@ -419,12 +419,12 @@
         <Parameter Name="source" Type="Java.Text.ICharacterIterator" />
       </Parameters>
       <Docs>
-        <param name="source">the new source text</param>
+        <param name="source">the new source text.</param>
         <summary>Set a new string over which to iterate.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/CollationElementIterator#setText(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.CollationElementIterator.setText(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/CollationElementIterator#setText(java.text.CharacterIterator)" title="Reference documentation">Java documentation for <code>java.text.CollationElementIterator.setText(java.text.CharacterIterator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/Collator.xml b/docs/Mono.Android/en/Java.Text/Collator.xml
index 37255d49a0..f7cf756207 100644
--- a/docs/Mono.Android/en/Java.Text/Collator.xml
+++ b/docs/Mono.Android/en/Java.Text/Collator.xml
@@ -265,16 +265,17 @@
         <Parameter Name="target" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="source">To be added.</param>
-        <param name="target">To be added.</param>
-        <summary>Compares its two arguments for order.</summary>
-        <returns>a negative integer, zero, or a positive integer as the
-                    first argument is less than, equal to, or greater than the
-                    second.</returns>
+        <param name="source">the source string.</param>
+        <param name="target">the target string.</param>
+        <summary>Compares the source string to the target string according to the
+            collation rules for this Collator.</summary>
+        <returns>Returns an integer value. Value is less than zero if source is less than
+            target, value is zero if source and target are equal, value is greater than zero
+            if source is greater than target.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/Collator#compare(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.text.Collator.compare(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/Collator#compare(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.Collator.compare(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -377,16 +378,16 @@
         <Parameter Name="target" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="source">To be added.</param>
-        <param name="target">To be added.</param>
-        <param name="that">the Collator to be compared with this.</param>
-        <summary>Compares the equality of two Collators.</summary>
-        <returns>true if this Collator is the same as that Collator;
-            false otherwise.</returns>
+        <param name="source">the source string to be compared with.</param>
+        <param name="target">the target string to be compared with.</param>
+        <summary>Convenience method for comparing the equality of two strings based on
+            this Collator's collation rules.</summary>
+        <returns>true if the strings are equal according to the collation
+            rules.  false, otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/Collator#equals(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.text.Collator.equals(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/Collator#equals(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.Collator.equals(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -590,13 +591,13 @@
         <Parameter Name="desiredLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="desiredLocale">To be added.</param>
-        <summary>Gets the Collator for the current default locale.</summary>
-        <returns>the Collator for the default locale.(for example, en_US)</returns>
+        <param name="desiredLocale">the desired locale.</param>
+        <summary>Gets the Collator for the desired locale.</summary>
+        <returns>the Collator for the desired locale.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/Collator#getInstance()" title="Reference documentation">Java documentation for <code>java.text.Collator.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/Collator#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.Collator.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/DateFormat.xml b/docs/Mono.Android/en/Java.Text/DateFormat.xml
index 89d7c4c9e6..012a9d0b8f 100644
--- a/docs/Mono.Android/en/Java.Text/DateFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/DateFormat.xml
@@ -499,31 +499,13 @@
         <Parameter Name="date" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="date">the date to format.</param>
-        <param name="obj">must be a Number or a Date.</param>
-        <param name="toAppendTo">the string buffer for the returning time string.</param>
-        <param name="fieldPosition">keeps track of the position of the field
-            within the returned string.
-            On input: an alignment field,
-            if desired. On output: the offsets of the alignment field. For
-            example, given a time text "1996.07.10 AD at 15:08:56 PDT",
-            if the given fieldPosition is DateFormat.YEAR_FIELD, the
-            begin index and end index of fieldPosition will be set to
-            0 and 4, respectively.
-            Notice that if the same time field appears
-            more than once in a pattern, the fieldPosition will be set for the first
-            occurrence of that time field. For instance, formatting a Date to
-            the time string "1 PM PDT (Pacific Daylight Time)" using the pattern
-            "h a z (zzzz)" and the alignment field DateFormat.TIMEZONE_FIELD,
-            the begin index and end index of fieldPosition will be set to
-            5 and 8, respectively, for the first occurrence of the timezone
-            pattern character 'z'.</param>
-        <summary>Overrides Format.</summary>
-        <returns>the string buffer passed in as toAppendTo, with formatted text appended.</returns>
+        <param name="date">the time value to be formatted into a time string.</param>
+        <summary>Formats a Date into a date/time string.</summary>
+        <returns>the formatted time string.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#format(java.lang.Object,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#format(java.util.Date)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.format(java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -623,9 +605,8 @@
         <Parameter Name="fieldPosition" Type="Java.Text.FieldPosition" />
       </Parameters>
       <Docs>
-        <param name="date">the date to format.</param>
-        <param name="obj">must be a Number or a Date.</param>
-        <param name="toAppendTo">the string buffer for the returning time string.</param>
+        <param name="date">a Date to be formatted into a date/time string.</param>
+        <param name="toAppendTo">the string buffer for the returning date/time string.</param>
         <param name="fieldPosition">keeps track of the position of the field
             within the returned string.
             On input: an alignment field,
@@ -642,12 +623,12 @@
             the begin index and end index of fieldPosition will be set to
             5 and 8, respectively, for the first occurrence of the timezone
             pattern character 'z'.</param>
-        <summary>Overrides Format.</summary>
+        <summary>Formats a Date into a date/time string.</summary>
         <returns>the string buffer passed in as toAppendTo, with formatted text appended.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#format(java.lang.Object,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#format(java.util.Date,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
@@ -760,14 +741,15 @@
         <Parameter Name="style" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="style">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <summary>Gets the date formatter with the default formatting style
+        <param name="style">the given formatting style. For example,
+            SHORT for "M/d/yy" in the US locale.</param>
+        <summary>Gets the date formatter with the given formatting style
             for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <returns>a date formatter.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateInstance()" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateInstance(int)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateInstance(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -806,15 +788,16 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="style">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <param name="aLocale">To be added.</param>
-        <summary>Gets the date formatter with the default formatting style
-            for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="style">the given formatting style. For example,
+            SHORT for "M/d/yy" in the US locale.</param>
+        <param name="aLocale">the given locale.</param>
+        <summary>Gets the date formatter with the given formatting style
+            for the given locale.</summary>
         <returns>a date formatter.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateInstance()" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateInstance(int,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateInstance(int, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -852,15 +835,17 @@
         <Parameter Name="timeStyle" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dateStyle">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <param name="timeStyle">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <summary>Gets the date/time formatter with the default formatting style
-            for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="dateStyle">the given date formatting style. For example,
+            SHORT for "M/d/yy" in the US locale.</param>
+        <param name="timeStyle">the given time formatting style. For example,
+            SHORT for "h:mm a" in the US locale.</param>
+        <summary>Gets the date/time formatter with the given date and time
+            formatting styles for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <returns>a date/time formatter.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateTimeInstance()" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateTimeInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateTimeInstance(int,%20int)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateTimeInstance(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -900,16 +885,16 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="dateStyle">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <param name="timeStyle">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <param name="aLocale">To be added.</param>
-        <summary>Gets the date/time formatter with the default formatting style
-            for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="dateStyle">the given date formatting style.</param>
+        <param name="timeStyle">the given time formatting style.</param>
+        <param name="aLocale">the given locale.</param>
+        <summary>Gets the date/time formatter with the given formatting styles
+            for the given locale.</summary>
         <returns>a date/time formatter.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateTimeInstance()" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateTimeInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#getDateTimeInstance(int,%20int,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getDateTimeInstance(int, int, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -947,14 +932,15 @@
         <Parameter Name="style" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="style">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <summary>Gets the time formatter with the default formatting style
+        <param name="style">the given formatting style. For example,
+            SHORT for "h:mm a" in the US locale.</param>
+        <summary>Gets the time formatter with the given formatting style
             for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <returns>a time formatter.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#getTimeInstance()" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getTimeInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#getTimeInstance(int)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getTimeInstance(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -993,15 +979,16 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="style">one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.</param>
-        <param name="aLocale">To be added.</param>
-        <summary>Gets the time formatter with the default formatting style
-            for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="style">the given formatting style. For example,
+            SHORT for "h:mm a" in the US locale.</param>
+        <param name="aLocale">the given locale.</param>
+        <summary>Gets the time formatter with the given formatting style
+            for the given locale.</summary>
         <returns>a time formatter.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#getTimeInstance()" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getTimeInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#getTimeInstance(int,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.getTimeInstance(int, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -1585,14 +1572,16 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="pos">To be added.</param>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
-        <summary>Parses text from the beginning of the given string to produce a date.</summary>
-        <returns>A &lt;code&gt;Date&lt;/code&gt; parsed from the string.</returns>
+        <param name="source">The date/time string to be parsed</param>
+        <param name="pos">On input, the position at which to start parsing; on
+                         output, the position at which parsing terminated, or the
+                         start position if the parse failed.</param>
+        <summary>Parse a date/time string according to the given parse position.</summary>
+        <returns>A <c>Date</c>, or <c>null</c> if the input could not be parsed</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormat#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.parse(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormat#parse(java.lang.String,%20java.text.ParsePosition)" title="Reference documentation">Java documentation for <code>java.text.DateFormat.parse(java.lang.String, java.text.ParsePosition)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml b/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml
index 3d91861c08..7f16b2a164 100644
--- a/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml
+++ b/docs/Mono.Android/en/Java.Text/DateFormatSymbols.xml
@@ -107,14 +107,13 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
+        <param name="locale">the desired locale</param>
         <summary>Construct a DateFormatSymbols object by loading format data from
-            resources for the default <c>java.util.Locale.Category#FORMAT FORMAT</c>
-            locale.</summary>
+            resources for the given locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormatSymbols#DateFormatSymbols()" title="Reference documentation">Java documentation for <code>java.text.DateFormatSymbols.DateFormatSymbols()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormatSymbols#DateFormatSymbols(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.DateFormatSymbols.DateFormatSymbols(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -327,14 +326,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the locale</param>
-        <summary>Gets the &lt;code&gt;DateFormatSymbols&lt;/code&gt; instance for the default
+        <param name="locale">the given locale.</param>
+        <summary>Gets the &lt;code&gt;DateFormatSymbols&lt;/code&gt; instance for the specified
             locale.</summary>
         <returns>a &lt;code&gt;DateFormatSymbols&lt;/code&gt; instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DateFormatSymbols#getInstance()" title="Reference documentation">Java documentation for <code>java.text.DateFormatSymbols.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DateFormatSymbols#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.DateFormatSymbols.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/DecimalFormat.xml b/docs/Mono.Android/en/Java.Text/DecimalFormat.xml
index 9c03f12325..838c7af56b 100644
--- a/docs/Mono.Android/en/Java.Text/DecimalFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/DecimalFormat.xml
@@ -89,13 +89,13 @@
         <Parameter Name="pattern" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <summary>Creates a DecimalFormat using the default pattern and symbols
+        <param name="pattern">a non-localized pattern string.</param>
+        <summary>Creates a DecimalFormat using the given pattern and the symbols
             for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DecimalFormat#DecimalFormat()" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.DecimalFormat()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DecimalFormat#DecimalFormat(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.DecimalFormat(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,14 +153,13 @@
         <Parameter Name="symbols" Type="Java.Text.DecimalFormatSymbols" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <param name="symbols">To be added.</param>
-        <summary>Creates a DecimalFormat using the default pattern and symbols
-            for the default <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="pattern">a non-localized pattern string</param>
+        <param name="symbols">the set of symbols to be used</param>
+        <summary>Creates a DecimalFormat using the given pattern and symbols.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DecimalFormat#DecimalFormat()" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.DecimalFormat()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DecimalFormat#DecimalFormat(java.lang.String,%20java.text.DecimalFormatSymbols)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.DecimalFormat(java.lang.String, java.text.DecimalFormatSymbols)</code>.</a>
             </format>
           </para>
           <para>
@@ -387,18 +386,18 @@
         <Parameter Name="pos" Type="Java.Text.FieldPosition" />
       </Parameters>
       <Docs>
-        <param name="toAppendTo">To be added.</param>
-        <param name="pos">To be added.</param>
-        <param name="number">The double to format</param>
-        <param name="result">where the text is to be appended</param>
-        <param name="fieldPosition">On input: an alignment field, if desired.
-            On output: the offsets of the alignment field.</param>
-        <summary>Formats a double to produce a string.</summary>
-        <returns>The formatted number string</returns>
+        <param name="number">the number to format</param>
+        <param name="toAppendTo">the &lt;code&gt;StringBuffer&lt;/code&gt; to which the formatted
+                              text is to be appended</param>
+        <param name="pos">On input: an alignment field, if desired.
+                              On output: the offsets of the alignment field.</param>
+        <summary>Formats a number and appends the resulting text to the given string
+            buffer.</summary>
+        <returns>the value passed in as &lt;code&gt;toAppendTo&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DecimalFormat#format(double,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.format(double, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DecimalFormat#format(java.lang.Object,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
@@ -481,16 +480,16 @@
         <Parameter Name="fieldPosition" Type="Java.Text.FieldPosition" />
       </Parameters>
       <Docs>
-        <param name="number">The double to format</param>
+        <param name="number">The long to format</param>
         <param name="result">where the text is to be appended</param>
         <param name="fieldPosition">On input: an alignment field, if desired.
             On output: the offsets of the alignment field.</param>
-        <summary>Formats a double to produce a string.</summary>
+        <summary>Format a long to produce a string.</summary>
         <returns>The formatted number string</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DecimalFormat#format(double,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.format(double, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DecimalFormat#format(long,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormat.format(long, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml b/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml
index 3e1e1370f4..e6b86541ad 100644
--- a/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml
+++ b/docs/Mono.Android/en/Java.Text/DecimalFormatSymbols.xml
@@ -106,13 +106,12 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
-        <summary>Create a DecimalFormatSymbols object for the default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="locale">the desired locale</param>
+        <summary>Create a DecimalFormatSymbols object for the given locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DecimalFormatSymbols#DecimalFormatSymbols()" title="Reference documentation">Java documentation for <code>java.text.DecimalFormatSymbols.DecimalFormatSymbols()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DecimalFormatSymbols#DecimalFormatSymbols(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormatSymbols.DecimalFormatSymbols(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -510,14 +509,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the locale</param>
-        <summary>Gets the &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instance for the default
+        <param name="locale">the desired locale.</param>
+        <summary>Gets the &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instance for the specified
             locale.</summary>
         <returns>a &lt;code&gt;DecimalFormatSymbols&lt;/code&gt; instance.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/DecimalFormatSymbols#getInstance()" title="Reference documentation">Java documentation for <code>java.text.DecimalFormatSymbols.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/DecimalFormatSymbols#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.DecimalFormatSymbols.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/FieldPosition.xml b/docs/Mono.Android/en/Java.Text/FieldPosition.xml
index 649ef95fdb..b686ea903e 100644
--- a/docs/Mono.Android/en/Java.Text/FieldPosition.xml
+++ b/docs/Mono.Android/en/Java.Text/FieldPosition.xml
@@ -56,7 +56,6 @@
       </Parameters>
       <Docs>
         <param name="attribute">To be added.</param>
-        <param name="field">the field identifier</param>
         <summary>Creates a FieldPosition object for the given field.</summary>
         <remarks>
           <para>
@@ -133,7 +132,6 @@
       <Docs>
         <param name="attribute">To be added.</param>
         <param name="fieldID">To be added.</param>
-        <param name="field">the field identifier</param>
         <summary>Creates a FieldPosition object for the given field.</summary>
         <remarks>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/IAttributedCharacterIterator.xml b/docs/Mono.Android/en/Java.Text/IAttributedCharacterIterator.xml
index df72245b1e..900a952aba 100644
--- a/docs/Mono.Android/en/Java.Text/IAttributedCharacterIterator.xml
+++ b/docs/Mono.Android/en/Java.Text/IAttributedCharacterIterator.xml
@@ -210,14 +210,14 @@
         <Parameter Name="attributes" Type="System.Collections.Generic.ICollection&lt;Java.Text.AttributedCharacterIteratorAttribute&gt;" />
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
+        <param name="attributes">a set of the desired attributes</param>
         <summary>Returns the index of the first character following the run
-            with respect to all attributes containing the current character.</summary>
+            with respect to the given <c>attributes</c> containing the current character.</summary>
         <returns>the index of the first character following the run</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/AttributedCharacterIterator#getRunLimit()" title="Reference documentation">Java documentation for <code>java.text.AttributedCharacterIterator.getRunLimit()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/AttributedCharacterIterator#getRunLimit(java.util.Set)" title="Reference documentation">Java documentation for <code>java.text.AttributedCharacterIterator.getRunLimit(java.util.Set)</code>.</a>
             </format>
           </para>
           <para>
@@ -293,14 +293,14 @@
         <Parameter Name="attributes" Type="System.Collections.Generic.ICollection&lt;Java.Text.AttributedCharacterIteratorAttribute&gt;" />
       </Parameters>
       <Docs>
-        <param name="attributes">To be added.</param>
+        <param name="attributes">a set of the desired attributes.</param>
         <summary>Returns the index of the first character of the run
-            with respect to all attributes containing the current character.</summary>
+            with respect to the given <c>attributes</c> containing the current character.</summary>
         <returns>the index of the first character of the run</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/AttributedCharacterIterator#getRunStart()" title="Reference documentation">Java documentation for <code>java.text.AttributedCharacterIterator.getRunStart()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/AttributedCharacterIterator#getRunStart(java.util.Set)" title="Reference documentation">Java documentation for <code>java.text.AttributedCharacterIterator.getRunStart(java.util.Set)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/MessageFormat.xml b/docs/Mono.Android/en/Java.Text/MessageFormat.xml
index 21dc6d4342..eadcd24be3 100644
--- a/docs/Mono.Android/en/Java.Text/MessageFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/MessageFormat.xml
@@ -115,15 +115,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
         <param name="pattern">the pattern for this message format</param>
-        <summary>Constructs a MessageFormat for the default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale and the
-            specified pattern.</summary>
+        <param name="locale">the locale for this message format</param>
+        <summary>Constructs a MessageFormat for the specified locale and
+            pattern.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/MessageFormat#MessageFormat(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.MessageFormat.MessageFormat(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/MessageFormat#MessageFormat(java.lang.String,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.MessageFormat.MessageFormat(java.lang.String, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -212,9 +211,6 @@
       <Docs>
         <param name="pattern">To be added.</param>
         <param name="arguments">an array of objects to be formatted and substituted.</param>
-        <param name="result">where text is appended.</param>
-        <param name="pos">On input: an alignment field, if desired.
-                       On output: the offsets of the alignment field.</param>
         <summary>Formats an array of objects and appends the &lt;code&gt;MessageFormat&lt;/code&gt;'s
             pattern, with format elements replaced by the formatted objects, to the
             provided &lt;code&gt;StringBuffer&lt;/code&gt;.</summary>
@@ -559,8 +555,8 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="pos">To be added.</param>
         <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
+        <param name="pos">To be added.</param>
         <summary>Parses text from the beginning of the given string to produce an object
             array.</summary>
         <returns>An &lt;code&gt;Object&lt;/code&gt; array parsed from the string.</returns>
diff --git a/docs/Mono.Android/en/Java.Text/NumberFormat.xml b/docs/Mono.Android/en/Java.Text/NumberFormat.xml
index f39045d07a..504d762f49 100644
--- a/docs/Mono.Android/en/Java.Text/NumberFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/NumberFormat.xml
@@ -246,13 +246,13 @@
         <Parameter Name="number" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="number">the double number to format</param>
+        <param name="number">the long number to format</param>
         <summary>Specialization of format.</summary>
         <returns>the formatted String</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(double)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(long)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -289,15 +289,18 @@
         <Parameter Name="pos" Type="Java.Text.FieldPosition" />
       </Parameters>
       <Docs>
-        <param name="toAppendTo">To be added.</param>
-        <param name="pos">To be added.</param>
-        <param name="number">the double number to format</param>
-        <summary>Specialization of format.</summary>
-        <returns>the formatted String</returns>
+        <param name="number">the number to format</param>
+        <param name="toAppendTo">the &lt;code&gt;StringBuffer&lt;/code&gt; to which the formatted
+                              text is to be appended</param>
+        <param name="pos">On input: an alignment field, if desired.
+                              On output: the offsets of the alignment field.</param>
+        <summary>Formats a number and appends the resulting text to the given string
+            buffer.</summary>
+        <returns>the value passed in as &lt;code&gt;toAppendTo&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(double)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(java.lang.Object,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
@@ -336,15 +339,16 @@
         <Parameter Name="pos" Type="Java.Text.FieldPosition" />
       </Parameters>
       <Docs>
-        <param name="toAppendTo">To be added.</param>
-        <param name="pos">To be added.</param>
         <param name="number">the double number to format</param>
+        <param name="toAppendTo">the StringBuffer to which the formatted text is to be
+                              appended</param>
+        <param name="pos">the field position</param>
         <summary>Specialization of format.</summary>
-        <returns>the formatted String</returns>
+        <returns>the formatted StringBuffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(double)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(double,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(double, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
@@ -381,15 +385,16 @@
         <Parameter Name="pos" Type="Java.Text.FieldPosition" />
       </Parameters>
       <Docs>
-        <param name="toAppendTo">To be added.</param>
-        <param name="pos">To be added.</param>
-        <param name="number">the double number to format</param>
+        <param name="number">the long number to format</param>
+        <param name="toAppendTo">the StringBuffer to which the formatted text is to be
+                              appended</param>
+        <param name="pos">the field position</param>
         <summary>Specialization of format.</summary>
-        <returns>the formatted String</returns>
+        <returns>the formatted StringBuffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(double)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(double)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#format(long,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.format(long, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
@@ -502,14 +507,13 @@
         <Parameter Name="inLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="inLocale">To be added.</param>
-        <summary>Returns a currency format for the current default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="inLocale">the desired locale</param>
+        <summary>Returns a currency format for the specified locale.</summary>
         <returns>the <c>NumberFormat</c> instance for currency formatting</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#getCurrencyInstance()" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getCurrencyInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#getCurrencyInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getCurrencyInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -544,15 +548,14 @@
         <Parameter Name="inLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="inLocale">To be added.</param>
-        <summary>Returns a general-purpose number format for the current default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="inLocale">the desired locale</param>
+        <summary>Returns a general-purpose number format for the specified locale.</summary>
         <returns>the <c>NumberFormat</c> instance for general-purpose number
             formatting</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#getInstance()" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -587,14 +590,13 @@
         <Parameter Name="inLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="inLocale">To be added.</param>
-        <summary>Returns an integer number format for the current default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="inLocale">the desired locale</param>
+        <summary>Returns an integer number format for the specified locale.</summary>
         <returns>a number format for integer values</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#getIntegerInstance()" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getIntegerInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#getIntegerInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getIntegerInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -629,15 +631,14 @@
         <Parameter Name="inLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="inLocale">To be added.</param>
-        <summary>Returns a general-purpose number format for the current default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="inLocale">the desired locale</param>
+        <summary>Returns a general-purpose number format for the specified locale.</summary>
         <returns>the <c>NumberFormat</c> instance for general-purpose number
             formatting</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#getNumberInstance()" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getNumberInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#getNumberInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getNumberInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -672,14 +673,13 @@
         <Parameter Name="inLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="inLocale">To be added.</param>
-        <summary>Returns a percentage format for the current default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="inLocale">the desired locale</param>
+        <summary>Returns a percentage format for the specified locale.</summary>
         <returns>the <c>NumberFormat</c> instance for percentage formatting</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#getPercentInstance()" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getPercentInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#getPercentInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.getPercentInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -1207,14 +1207,14 @@
         <Parameter Name="parsePosition" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="parsePosition">To be added.</param>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
-        <summary>Parses text from the beginning of the given string to produce a number.</summary>
-        <returns>A &lt;code&gt;Number&lt;/code&gt; parsed from the string.</returns>
+        <param name="source">the String to parse</param>
+        <param name="parsePosition">the parse position</param>
+        <summary>Returns a Long if possible (e.</summary>
+        <returns>the parsed value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/NumberFormat#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.parse(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/NumberFormat#parse(java.lang.String,%20java.text.ParsePosition)" title="Reference documentation">Java documentation for <code>java.text.NumberFormat.parse(java.lang.String, java.text.ParsePosition)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml b/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml
index b94eddbd40..25e856af3a 100644
--- a/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml
+++ b/docs/Mono.Android/en/Java.Text/RuleBasedCollator.xml
@@ -167,13 +167,13 @@
         <Parameter Name="source" Type="Java.Text.ICharacterIterator" />
       </Parameters>
       <Docs>
-        <param name="source">the string to be collated</param>
-        <summary>Returns a CollationElementIterator for the given String.</summary>
+        <param name="source">the character iterator to be collated</param>
+        <summary>Returns a CollationElementIterator for the given CharacterIterator.</summary>
         <returns>a <c>CollationElementIterator</c> object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/RuleBasedCollator#getCollationElementIterator(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.RuleBasedCollator.getCollationElementIterator(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/RuleBasedCollator#getCollationElementIterator(java.text.CharacterIterator)" title="Reference documentation">Java documentation for <code>java.text.RuleBasedCollator.getCollationElementIterator(java.text.CharacterIterator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml b/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml
index 45ee7e3adb..323066d18e 100644
--- a/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml
+++ b/docs/Mono.Android/en/Java.Text/SimpleDateFormat.xml
@@ -90,14 +90,14 @@
         <Parameter Name="pattern" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the default pattern and
-            date format symbols for the default
+        <param name="pattern">the pattern describing the date and time format</param>
+        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the given pattern and
+            the default date format symbols for the default
             <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/SimpleDateFormat#SimpleDateFormat()" title="Reference documentation">Java documentation for <code>java.text.SimpleDateFormat.SimpleDateFormat()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/SimpleDateFormat#SimpleDateFormat(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.SimpleDateFormat.SimpleDateFormat(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -157,15 +157,14 @@
         <Parameter Name="formatSymbols" Type="Java.Text.DateFormatSymbols" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <param name="formatSymbols">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the default pattern and
-            date format symbols for the default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="pattern">the pattern describing the date and time format</param>
+        <param name="formatSymbols">the date format symbols to be used for formatting</param>
+        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the given pattern and
+            date format symbols.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/SimpleDateFormat#SimpleDateFormat()" title="Reference documentation">Java documentation for <code>java.text.SimpleDateFormat.SimpleDateFormat()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/SimpleDateFormat#SimpleDateFormat(java.lang.String,%20java.text.DateFormatSymbols)" title="Reference documentation">Java documentation for <code>java.text.SimpleDateFormat.SimpleDateFormat(java.lang.String, java.text.DateFormatSymbols)</code>.</a>
             </format>
           </para>
           <para>
@@ -201,15 +200,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <param name="locale">To be added.</param>
-        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the default pattern and
-            date format symbols for the default
-            <c>java.util.Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="pattern">the pattern describing the date and time format</param>
+        <param name="locale">the locale whose date format symbols should be used</param>
+        <summary>Constructs a &lt;code&gt;SimpleDateFormat&lt;/code&gt; using the given pattern and
+            the default date format symbols for the given locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/SimpleDateFormat#SimpleDateFormat()" title="Reference documentation">Java documentation for <code>java.text.SimpleDateFormat.SimpleDateFormat()</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/SimpleDateFormat#SimpleDateFormat(java.lang.String,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.text.SimpleDateFormat.SimpleDateFormat(java.lang.String, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml b/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml
index 58da7c039c..7d522040fd 100644
--- a/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml
+++ b/docs/Mono.Android/en/Java.Text/StringCharacterIterator.xml
@@ -109,13 +109,13 @@
         <Parameter Name="pos" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pos">To be added.</param>
-        <param name="text">the <c>String</c> to be iterated over</param>
-        <summary>Constructs an iterator with an initial index of 0.</summary>
+        <param name="text">The String to be iterated over</param>
+        <param name="pos">Initial iterator position</param>
+        <summary>Constructs an iterator with the specified initial index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/StringCharacterIterator#StringCharacterIterator(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.StringCharacterIterator.StringCharacterIterator(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/StringCharacterIterator#StringCharacterIterator(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.text.StringCharacterIterator.StringCharacterIterator(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,15 +153,16 @@
         <Parameter Name="pos" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="begin">To be added.</param>
-        <param name="end">To be added.</param>
-        <param name="pos">To be added.</param>
-        <param name="text">the <c>String</c> to be iterated over</param>
-        <summary>Constructs an iterator with an initial index of 0.</summary>
+        <param name="text">The String to be iterated over</param>
+        <param name="begin">Index of the first character</param>
+        <param name="end">Index of the character following the last character</param>
+        <param name="pos">Initial iterator position</param>
+        <summary>Constructs an iterator over the given range of the given string, with the
+            index set at the specified position.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/StringCharacterIterator#StringCharacterIterator(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.StringCharacterIterator.StringCharacterIterator(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/StringCharacterIterator#StringCharacterIterator(java.lang.String,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.text.StringCharacterIterator.StringCharacterIterator(java.lang.String, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Text/_Format.xml b/docs/Mono.Android/en/Java.Text/_Format.xml
index 8f82d27e84..892370db43 100644
--- a/docs/Mono.Android/en/Java.Text/_Format.xml
+++ b/docs/Mono.Android/en/Java.Text/_Format.xml
@@ -214,15 +214,18 @@
         <Parameter Name="pos" Type="Java.Text.FieldPosition" />
       </Parameters>
       <Docs>
-        <param name="toAppendTo">To be added.</param>
-        <param name="pos">To be added.</param>
         <param name="obj">The object to format</param>
-        <summary>Formats an object to produce a string.</summary>
-        <returns>Formatted string.</returns>
+        <param name="toAppendTo">where the text is to be appended</param>
+        <param name="pos">A &lt;code&gt;FieldPosition&lt;/code&gt; identifying a field
+                          in the formatted text</param>
+        <summary>Formats an object and appends the resulting text to a given string
+            buffer.</summary>
+        <returns>the string buffer passed in as &lt;code&gt;toAppendTo&lt;/code&gt;,
+                          with formatted text appended</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/Format#format(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.text.Format.format(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/Format#format(java.lang.Object,%20java.lang.StringBuffer,%20java.text.FieldPosition)" title="Reference documentation">Java documentation for <code>java.text.Format.format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition)</code>.</a>
             </format>
           </para>
           <para>
@@ -380,14 +383,16 @@
         <Parameter Name="pos" Type="Java.Text.ParsePosition" />
       </Parameters>
       <Docs>
-        <param name="pos">To be added.</param>
-        <param name="source">A &lt;code&gt;String&lt;/code&gt; whose beginning should be parsed.</param>
-        <summary>Parses text from the beginning of the given string to produce an object.</summary>
-        <returns>An &lt;code&gt;Object&lt;/code&gt; parsed from the string.</returns>
+        <param name="source">A &lt;code&gt;String&lt;/code&gt;, part of which should be parsed.</param>
+        <param name="pos">A &lt;code&gt;ParsePosition&lt;/code&gt; object with index and error
+                       index information as described above.</param>
+        <summary>Parses text from a string to produce an object.</summary>
+        <returns>An &lt;code&gt;Object&lt;/code&gt; parsed from the string. In case of
+                    error, returns null.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/text/Format#parseObject(java.lang.String)" title="Reference documentation">Java documentation for <code>java.text.Format.parseObject(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/text/Format#parseObject(java.lang.String,%20java.text.ParsePosition)" title="Reference documentation">Java documentation for <code>java.text.Format.parseObject(java.lang.String, java.text.ParsePosition)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatter.xml b/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatter.xml
index 6806440bb2..6395e76b07 100644
--- a/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatter.xml
+++ b/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatter.xml
@@ -755,15 +755,14 @@
         <Parameter Name="timeStyle" Type="Java.Time.Format.FormatStyle" />
       </Parameters>
       <Docs>
-        <param name="dateStyle">To be added.</param>
-        <param name="timeStyle">To be added.</param>
-        <param name="dateTimeStyle">the formatter style to obtain, not null</param>
-        <summary>Returns a locale specific date-time formatter for the ISO chronology.</summary>
-        <returns>the date-time formatter, not null</returns>
+        <param name="dateStyle">the date formatter style to obtain, not null</param>
+        <param name="timeStyle">the time formatter style to obtain, not null</param>
+        <summary>Returns a locale specific date and time format for the ISO chronology.</summary>
+        <returns>the date, time or date-time formatter, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatter#ofLocalizedDateTime(java.time.format.FormatStyle)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatter.ofLocalizedDateTime(java.time.format.FormatStyle)</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatter#ofLocalizedDateTime(java.time.format.FormatStyle,%20java.time.format.FormatStyle)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatter.ofLocalizedDateTime(java.time.format.FormatStyle, java.time.format.FormatStyle)</code>.</a>
             </format>
           </para>
           <para>
@@ -878,14 +877,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
         <param name="pattern">the pattern to use, not null</param>
-        <summary>Creates a formatter using the specified pattern.</summary>
+        <param name="locale">the locale to use, not null</param>
+        <summary>Creates a formatter using the specified pattern and locale.</summary>
         <returns>the formatter based on the pattern, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatter#ofPattern(java.lang.String)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatter.ofPattern(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatter#ofPattern(java.lang.String,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatter.ofPattern(java.lang.String, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatterBuilder.xml b/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatterBuilder.xml
index 6ec94f2442..7314060727 100644
--- a/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatterBuilder.xml
+++ b/docs/Mono.Android/en/Java.Time.Format/DateTimeFormatterBuilder.xml
@@ -243,14 +243,15 @@
         <Parameter Name="fractionalDigits" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fractionalDigits">To be added.</param>
-        <summary>Appends an instant using ISO-8601 to the formatter, formatting fractional
-            digits in groups of three.</summary>
+        <param name="fractionalDigits">the number of fractional second digits to format with,
+             from 0 to 9, or -1 to use as many digits as necessary</param>
+        <summary>Appends an instant using ISO-8601 to the formatter with control over
+            the number of fractional digits.</summary>
         <returns>this, for chaining, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#appendInstant()" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.appendInstant()</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#appendInstant(int)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.appendInstant(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -325,12 +326,12 @@
       </Parameters>
       <Docs>
         <param name="literal">the literal to append, not null</param>
-        <summary>Appends a character literal to the formatter.</summary>
+        <summary>Appends a string literal to the formatter.</summary>
         <returns>this, for chaining, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#appendLiteral(char)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.appendLiteral(char)</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#appendLiteral(java.lang.String)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.appendLiteral(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -895,14 +896,14 @@
         <Parameter Name="padChar" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="padChar">To be added.</param>
         <param name="padWidth">the pad width, 1 or greater</param>
-        <summary>Causes the next added printer/parser to pad to a fixed width using a space.</summary>
+        <param name="padChar">the pad character</param>
+        <summary>Causes the next added printer/parser to pad to a fixed width.</summary>
         <returns>this, for chaining, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#padNext(int)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.padNext(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#padNext(int,%20char)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.padNext(int, char)</code>.</a>
             </format>
           </para>
           <para>
@@ -1184,14 +1185,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
+        <param name="locale">the locale to use for formatting, not null</param>
         <summary>Completes this builder by creating the <c>DateTimeFormatter</c>
-            using the default locale.</summary>
+            using the specified locale.</summary>
         <returns>the created formatter, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#toFormatter()" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.toFormatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder#toFormatter(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.time.format.DateTimeFormatterBuilder.toFormatter(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Time.Temporal/ValueRange.xml b/docs/Mono.Android/en/Java.Time.Temporal/ValueRange.xml
index 6f9d4d034b..8a5ae2dc31 100644
--- a/docs/Mono.Android/en/Java.Time.Temporal/ValueRange.xml
+++ b/docs/Mono.Android/en/Java.Time.Temporal/ValueRange.xml
@@ -408,16 +408,15 @@
         <Parameter Name="maxLargest" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="maxSmallest">To be added.</param>
-        <param name="maxLargest">To be added.</param>
         <param name="min">the minimum value</param>
-        <param name="max">the maximum value</param>
-        <summary>Obtains a fixed value range.</summary>
-        <returns>the ValueRange for min, max, not null</returns>
+        <param name="maxSmallest">the smallest maximum value</param>
+        <param name="maxLargest">the largest maximum value</param>
+        <summary>Obtains a variable value range.</summary>
+        <returns>the ValueRange for min, smallest max, largest max, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/temporal/ValueRange#of(long,%20long)" title="Reference documentation">Java documentation for <code>java.time.temporal.ValueRange.of(long, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/temporal/ValueRange#of(long,%20long,%20long)" title="Reference documentation">Java documentation for <code>java.time.temporal.ValueRange.of(long, long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -454,18 +453,16 @@
         <Parameter Name="maxLargest" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="minSmallest">To be added.</param>
-        <param name="minLargest">To be added.</param>
-        <param name="maxSmallest">To be added.</param>
-        <param name="maxLargest">To be added.</param>
-        <param name="min">the minimum value</param>
-        <param name="max">the maximum value</param>
-        <summary>Obtains a fixed value range.</summary>
-        <returns>the ValueRange for min, max, not null</returns>
+        <param name="minSmallest">the smallest minimum value</param>
+        <param name="minLargest">the largest minimum value</param>
+        <param name="maxSmallest">the smallest maximum value</param>
+        <param name="maxLargest">the largest maximum value</param>
+        <summary>Obtains a fully variable value range.</summary>
+        <returns>the ValueRange for smallest min, largest min, smallest max, largest max, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/temporal/ValueRange#of(long,%20long)" title="Reference documentation">Java documentation for <code>java.time.temporal.ValueRange.of(long, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/temporal/ValueRange#of(long,%20long,%20long,%20long)" title="Reference documentation">Java documentation for <code>java.time.temporal.ValueRange.of(long, long, long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Time.Temporal/WeekFields.xml b/docs/Mono.Android/en/Java.Time.Temporal/WeekFields.xml
index 8c791237b6..0d2cd24f71 100644
--- a/docs/Mono.Android/en/Java.Time.Temporal/WeekFields.xml
+++ b/docs/Mono.Android/en/Java.Time.Temporal/WeekFields.xml
@@ -176,15 +176,13 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
-        <param name="firstDayOfWeek">the first day of the week, not null</param>
-        <param name="minimalDaysInFirstWeek">the minimal number of days in the first week, from 1 to 7</param>
-        <summary>Obtains an instance of <c>WeekFields</c> from the first day-of-week and minimal days.</summary>
+        <param name="locale">the locale to use, not null</param>
+        <summary>Obtains an instance of <c>WeekFields</c> appropriate for a locale.</summary>
         <returns>the week-definition, not null</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/time/temporal/WeekFields#of(java.time.DayOfWeek,%20int)" title="Reference documentation">Java documentation for <code>java.time.temporal.WeekFields.of(java.time.DayOfWeek, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/time/temporal/WeekFields#of(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.time.temporal.WeekFields.of(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicBoolean.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicBoolean.xml
index 43443464b1..ad81f98126 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicBoolean.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicBoolean.xml
@@ -100,12 +100,12 @@
         <Parameter Name="initialValue" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="initialValue">To be added.</param>
-        <summary>Creates a new <c>AtomicBoolean</c> with initial value <c>false</c>.</summary>
+        <param name="initialValue">the initial value</param>
+        <summary>Creates a new <c>AtomicBoolean</c> with the given initial value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean#AtomicBoolean()" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicBoolean.AtomicBoolean()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean#AtomicBoolean(boolean)" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicBoolean.AtomicBoolean(boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicInteger.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicInteger.xml
index db55216e3f..067edcb679 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicInteger.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicInteger.xml
@@ -100,12 +100,12 @@
         <Parameter Name="initialValue" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialValue">To be added.</param>
-        <summary>Creates a new AtomicInteger with initial value <c>0</c>.</summary>
+        <param name="initialValue">the initial value</param>
+        <summary>Creates a new AtomicInteger with the given initial value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger#AtomicInteger()" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicInteger.AtomicInteger()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger#AtomicInteger(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicInteger.AtomicInteger(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicIntegerArray.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicIntegerArray.xml
index 1f63546b4e..a1fc65fa6c 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicIntegerArray.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicIntegerArray.xml
@@ -105,14 +105,13 @@
         <Parameter Name="array" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
-        <param name="length">the length of the array</param>
-        <summary>Creates a new AtomicIntegerArray of the given length, with all
-            elements initially zero.</summary>
+        <param name="array">the array to copy elements from</param>
+        <summary>Creates a new AtomicIntegerArray with the same length as, and
+            all elements copied from, the given array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray#AtomicIntegerArray(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicIntegerArray.AtomicIntegerArray(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray#AtomicIntegerArray(int[])" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicIntegerArray.AtomicIntegerArray(int[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLong.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLong.xml
index fae1412d6d..d142f12bc3 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLong.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLong.xml
@@ -100,12 +100,12 @@
         <Parameter Name="initialValue" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="initialValue">To be added.</param>
-        <summary>Creates a new AtomicLong with initial value <c>0</c>.</summary>
+        <param name="initialValue">the initial value</param>
+        <summary>Creates a new AtomicLong with the given initial value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong#AtomicLong()" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicLong.AtomicLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong#AtomicLong(long)" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicLong.AtomicLong(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLongArray.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLongArray.xml
index fe4ca6d63b..7d68bd92ef 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLongArray.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicLongArray.xml
@@ -105,14 +105,13 @@
         <Parameter Name="array" Type="System.Int64[]" />
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
-        <param name="length">the length of the array</param>
-        <summary>Creates a new AtomicLongArray of the given length, with all
-            elements initially zero.</summary>
+        <param name="array">the array to copy elements from</param>
+        <summary>Creates a new AtomicLongArray with the same length as, and
+            all elements copied from, the given array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray#AtomicLongArray(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicLongArray.AtomicLongArray(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray#AtomicLongArray(long[])" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicLongArray.AtomicLongArray(long[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReference.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReference.xml
index a53ee8c004..39e9378879 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReference.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReference.xml
@@ -105,12 +105,12 @@
         <Parameter Name="initialValue" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="initialValue">To be added.</param>
-        <summary>Creates a new AtomicReference with null initial value.</summary>
+        <param name="initialValue">the initial value</param>
+        <summary>Creates a new AtomicReference with the given initial value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference#AtomicReference()" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicReference.AtomicReference()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference#AtomicReference(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicReference.AtomicReference(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReferenceArray.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReferenceArray.xml
index 3b63672331..4964c4aa19 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReferenceArray.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Atomic/AtomicReferenceArray.xml
@@ -73,14 +73,13 @@
         <Parameter Name="array" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
-        <param name="length">the length of the array</param>
-        <summary>Creates a new AtomicReferenceArray of the given length, with all
-            elements initially null.</summary>
+        <param name="array">the array to copy elements from</param>
+        <summary>Creates a new AtomicReferenceArray with the same length as, and
+            all elements copied from, the given array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray#AtomicReferenceArray(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicReferenceArray.AtomicReferenceArray(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray#AtomicReferenceArray(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.concurrent.atomic.AtomicReferenceArray.AtomicReferenceArray(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ICondition.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ICondition.xml
index 28fdbfec48..9109c8b34d 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ICondition.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ICondition.xml
@@ -113,13 +113,15 @@
       <Docs>
         <param name="time">the maximum time to wait</param>
         <param name="unit">the time unit of the <c>time</c> argument</param>
-        <summary>Causes the current thread to wait until it is signalled or
-            Thread#interrupt interrupted.</summary>
-        <returns>To be added.</returns>
+        <summary>Causes the current thread to wait until it is signalled or interrupted,
+            or the specified waiting time elapses.</summary>
+        <returns>
+          <c>false</c> if the waiting time detectably elapsed
+                    before return from the method, else <c>true</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/Condition#await()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.Condition.await()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/Condition#await(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.Condition.await(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ILock.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ILock.xml
index 776086495e..819b2b3c56 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ILock.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ILock.xml
@@ -231,14 +231,15 @@
       <Docs>
         <param name="time">the maximum time to wait for the lock</param>
         <param name="unit">the time unit of the <c>time</c> argument</param>
-        <summary>Acquires the lock only if it is free at the time of invocation.</summary>
+        <summary>Acquires the lock if it is free within the given waiting time and the
+            current thread has not been Thread#interrupt interrupted.</summary>
         <returns>
-          <c>true</c> if the lock was acquired and
-                    <c>false</c> otherwise</returns>
+          <c>true</c> if the lock was acquired and <c>false</c>
+                    if the waiting time elapsed before the lock was acquired</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/Lock#tryLock()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.Lock.tryLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/Lock#tryLock(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.Lock.tryLock(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/LockSupport.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/LockSupport.xml
index 16ad3aac7c..fc4fbd64cd 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/LockSupport.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/LockSupport.xml
@@ -195,13 +195,13 @@
       </Parameters>
       <Docs>
         <param name="blocker">the synchronization object responsible for this
-        thread parking</param>
+                   thread parking</param>
         <summary>Disables the current thread for thread scheduling purposes unless the
             permit is available.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport#park()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.LockSupport.park()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport#park(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.LockSupport.park(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -279,14 +279,14 @@
       </Parameters>
       <Docs>
         <param name="blocker">the synchronization object responsible for this
-        thread parking</param>
+                   thread parking</param>
         <param name="nanos">the maximum number of nanoseconds to wait</param>
         <summary>Disables the current thread for thread scheduling purposes, for up to
             the specified waiting time, unless the permit is available.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport#parkNanos(long)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.LockSupport.parkNanos(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport#parkNanos(java.lang.Object,%20long)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.LockSupport.parkNanos(java.lang.Object, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -365,7 +365,7 @@
       </Parameters>
       <Docs>
         <param name="blocker">the synchronization object responsible for this
-        thread parking</param>
+                   thread parking</param>
         <param name="deadline">the absolute time, in milliseconds from the Epoch,
                    to wait until</param>
         <summary>Disables the current thread for thread scheduling purposes, until
@@ -373,7 +373,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport#parkUntil(long)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.LockSupport.parkUntil(long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport#parkUntil(java.lang.Object,%20long)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.LockSupport.parkUntil(java.lang.Object, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantLock.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantLock.xml
index 3360f38fe0..f4065c822f 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantLock.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantLock.xml
@@ -106,12 +106,14 @@
         <Parameter Name="fair" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fair">To be added.</param>
-        <summary>Creates an instance of <c>ReentrantLock</c>.</summary>
+        <param name="fair">
+          <c>true</c> if this lock should use a fair ordering policy</param>
+        <summary>Creates an instance of <c>ReentrantLock</c> with the
+            given fairness policy.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock#ReentrantLock()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.ReentrantLock.ReentrantLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock#ReentrantLock(boolean)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.ReentrantLock.ReentrantLock(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -935,16 +937,18 @@
       <Docs>
         <param name="timeout">the time to wait for the lock</param>
         <param name="unit">the time unit of the timeout argument</param>
-        <summary>Acquires the lock only if it is not held by another thread at the time
-            of invocation.</summary>
+        <summary>Acquires the lock if it is not held by another thread within the given
+            waiting time and the current thread has not been
+            Thread#interrupt interrupted.</summary>
         <returns>
           <c>true</c> if the lock was free and was acquired by the
                     current thread, or the lock was already held by the current
-                    thread; and <c>false</c> otherwise</returns>
+                    thread; and <c>false</c> if the waiting time elapsed before
+                    the lock could be acquired</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock#tryLock()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.ReentrantLock.tryLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock#tryLock(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.ReentrantLock.tryLock(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantReadWriteLock.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantReadWriteLock.xml
index d31bde982a..6ce31e08cb 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantReadWriteLock.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/ReentrantReadWriteLock.xml
@@ -105,13 +105,14 @@
         <Parameter Name="fair" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fair">To be added.</param>
+        <param name="fair">
+          <c>true</c> if this lock should use a fair ordering policy</param>
         <summary>Creates a new <c>ReentrantReadWriteLock</c> with
-            default (nonfair) ordering properties.</summary>
+            the given fairness policy.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock#ReentrantReadWriteLock()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.ReentrantReadWriteLock.ReentrantReadWriteLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock#ReentrantReadWriteLock(boolean)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.ReentrantReadWriteLock.ReentrantReadWriteLock(boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/StampedLock.xml b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/StampedLock.xml
index 15b5f15f38..2c2d3f4fb2 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent.Locks/StampedLock.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent.Locks/StampedLock.xml
@@ -726,15 +726,16 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
-        <param name="unit">To be added.</param>
-        <summary>Non-exclusively acquires the lock if it is immediately available.</summary>
+        <param name="time">the maximum time to wait for the lock</param>
+        <param name="unit">the time unit of the <c>time</c> argument</param>
+        <summary>Non-exclusively acquires the lock if it is available within the
+            given time and the current thread has not been interrupted.</summary>
         <returns>a stamp that can be used to unlock or convert mode,
             or zero if the lock is not available</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock#tryReadLock()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.StampedLock.tryReadLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock#tryReadLock(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.StampedLock.tryReadLock(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -885,15 +886,16 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
-        <param name="unit">To be added.</param>
-        <summary>Exclusively acquires the lock if it is immediately available.</summary>
+        <param name="time">the maximum time to wait for the lock</param>
+        <param name="unit">the time unit of the <c>time</c> argument</param>
+        <summary>Exclusively acquires the lock if it is available within the
+            given time and the current thread has not been interrupted.</summary>
         <returns>a stamp that can be used to unlock or convert mode,
             or zero if the lock is not available</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock#tryWriteLock()" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.StampedLock.tryWriteLock()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock#tryWriteLock(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.locks.StampedLock.tryWriteLock(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/AbstractExecutorService.xml b/docs/Mono.Android/en/Java.Util.Concurrent/AbstractExecutorService.xml
index e9d847aca2..5b18679fe6 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/AbstractExecutorService.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/AbstractExecutorService.xml
@@ -498,20 +498,17 @@
         <Parameter Name="callable" Type="Java.Util.Concurrent.ICallable" />
       </Parameters>
       <Docs>
-        <param name="callable">To be added.</param>
-        <param name="runnable">the runnable task being wrapped</param>
-        <param name="value">the default value for the returned future</param>
-        <param name="&lt;T&gt;&lt;T&gt;">the type of the given value</param>
-        <summary>Returns a <c>RunnableFuture</c> for the given runnable and default
-            value.</summary>
-        <returns>a <c>RunnableFuture</c> which, when run, will run the
-            underlying runnable and which, as a <c>Future</c>, will yield
-            the given value as its result and provide for cancellation of
-            the underlying task</returns>
+        <param name="callable">the callable task being wrapped</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the callable's result</param>
+        <summary>Returns a <c>RunnableFuture</c> for the given callable task.</summary>
+        <returns>a <c>RunnableFuture</c> which, when run, will call the
+            underlying callable and which, as a <c>Future</c>, will yield
+            the callable's result as its result and provide for
+            cancellation of the underlying task</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService#newTaskFor(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.AbstractExecutorService.newTaskFor(java.lang.Runnable, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService#newTaskFor(java.util.concurrent.Callable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.AbstractExecutorService.newTaskFor(java.util.concurrent.Callable)</code>.</a>
             </format>
           </para>
           <para>
@@ -738,7 +735,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService#submit(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.AbstractExecutorService.submit(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService#submit(java.util.concurrent.Callable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.AbstractExecutorService.submit(java.util.concurrent.Callable)</code>.</a>
             </format>
           </para>
           <para>
@@ -787,7 +784,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService#submit(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.AbstractExecutorService.submit(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService#submit(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.AbstractExecutorService.submit(java.lang.Runnable, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ArrayBlockingQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ArrayBlockingQueue.xml
index 85be470fc9..946f8c5c32 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ArrayBlockingQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ArrayBlockingQueue.xml
@@ -125,14 +125,16 @@
         <Parameter Name="fair" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fair">To be added.</param>
         <param name="capacity">the capacity of this queue</param>
+        <param name="fair">if <c>true</c> then queue accesses for threads blocked
+                   on insertion or removal, are processed in FIFO order;
+                   if <c>false</c> the access order is unspecified.</param>
         <summary>Creates an <c>ArrayBlockingQueue</c> with the given (fixed)
-            capacity and default access policy.</summary>
+            capacity and the specified access policy.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#ArrayBlockingQueue(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.ArrayBlockingQueue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#ArrayBlockingQueue(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.ArrayBlockingQueue(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -190,15 +192,19 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="fair">To be added.</param>
-        <param name="c">To be added.</param>
         <param name="capacity">the capacity of this queue</param>
+        <param name="fair">if <c>true</c> then queue accesses for threads blocked
+                   on insertion or removal, are processed in FIFO order;
+                   if <c>false</c> the access order is unspecified.</param>
+        <param name="c">the collection of elements to initially contain</param>
         <summary>Creates an <c>ArrayBlockingQueue</c> with the given (fixed)
-            capacity and default access policy.</summary>
+            capacity, the specified access policy and initially containing the
+            elements of the given collection,
+            added in traversal order of the collection's iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#ArrayBlockingQueue(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.ArrayBlockingQueue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#ArrayBlockingQueue(int,%20boolean,%20java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.ArrayBlockingQueue(int, boolean, java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -286,7 +292,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -449,15 +455,14 @@
         <param name="e">To be added.</param>
         <param name="timeout">To be added.</param>
         <param name="unit">To be added.</param>
-        <summary>Inserts the specified element at the tail of this queue if it is
-            possible to do so immediately without exceeding the queue's capacity,
-            returning <c>true</c> upon success and <c>false</c> if this queue
-            is full.</summary>
+        <summary>Inserts the specified element at the tail of this queue, waiting
+            up to the specified wait time for space to become available if
+            the queue is full.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ArrayBlockingQueue.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/BrokenBarrierException.xml b/docs/Mono.Android/en/Java.Util.Concurrent/BrokenBarrierException.xml
index 3e26e432d6..58867d9d57 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/BrokenBarrierException.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/BrokenBarrierException.xml
@@ -90,13 +90,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a <c>BrokenBarrierException</c> with no specified detail
-            message.</summary>
+        <param name="message">the detail message</param>
+        <summary>Constructs a <c>BrokenBarrierException</c> with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BrokenBarrierException#BrokenBarrierException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.BrokenBarrierException.BrokenBarrierException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BrokenBarrierException#BrokenBarrierException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BrokenBarrierException.BrokenBarrierException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CancellationException.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CancellationException.xml
index 765e3133db..bd0498d316 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CancellationException.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CancellationException.xml
@@ -89,12 +89,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a <c>CancellationException</c> with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <summary>Constructs a <c>CancellationException</c> with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CancellationException#CancellationException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CancellationException.CancellationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CancellationException#CancellationException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CancellationException.CancellationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CompletableFuture.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CompletableFuture.xml
index d4d5713b58..79658f46d1 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CompletableFuture.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CompletableFuture.xml
@@ -600,17 +600,17 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="supplier">a function returning the value to be used
             to complete this CompletableFuture</param>
-        <summary>Completes this CompletableFuture with the result of the given
-            Supplier function invoked from an asynchronous task using the
-            default executor.</summary>
+        <param name="executor">the executor to use for asynchronous execution</param>
+        <summary>Completes this CompletableFuture with the result of
+            the given Supplier function invoked from an asynchronous
+            task using the given executor.</summary>
         <returns>this CompletableFuture</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#completeAsync(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.completeAsync(java.util.function.Supplier)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#completeAsync(java.util.function.Supplier,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.completeAsync(java.util.function.Supplier, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -950,17 +950,17 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="delay">how long to delay, in units of <c>unit</c></param>
         <param name="unit">a <c>TimeUnit</c> determining how to interpret the
                    <c>delay</c> parameter</param>
-        <summary>Returns a new Executor that submits a task to the default
+        <param name="executor">the base executor</param>
+        <summary>Returns a new Executor that submits a task to the given base
             executor after the given delay (or no delay if non-positive).</summary>
         <returns>the new delayed executor</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#delayedExecutor(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.delayedExecutor(long, java.util.concurrent.TimeUnit)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#delayedExecutor(long,%20java.util.concurrent.TimeUnit,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.delayedExecutor(long, java.util.concurrent.TimeUnit, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1182,15 +1182,15 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
-        <summary>Waits if necessary for this future to complete, and then
-            returns its result.</summary>
+        <param name="timeout">the maximum time to wait</param>
+        <param name="unit">the time unit of the timeout argument</param>
+        <summary>Waits if necessary for at most the given time for this future
+            to complete, and then returns its result, if available.</summary>
         <returns>the result value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#get()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#get(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.get(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -2087,17 +2087,17 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="runnable">the action to run before completing the
             returned CompletableFuture</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <summary>Returns a new CompletableFuture that is asynchronously completed
-            by a task running in the <c>ForkJoinPool#commonPool()</c> after
-            it runs the given action.</summary>
+            by a task running in the given executor after it runs the given
+            action.</summary>
         <returns>the new CompletableFuture</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#runAsync(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.runAsync(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#runAsync(java.lang.Runnable,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.runAsync(java.lang.Runnable, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -2184,18 +2184,18 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="supplier">a function returning the value to be used
             to complete the returned CompletableFuture</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <param name="&lt;U&gt;&lt;U&gt;">the function's return type</param>
         <summary>Returns a new CompletableFuture that is asynchronously completed
-            by a task running in the <c>ForkJoinPool#commonPool()</c> with
-            the value obtained by calling the given Supplier.</summary>
+            by a task running in the given executor with the value obtained
+            by calling the given Supplier.</summary>
         <returns>the new CompletableFuture</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#supplyAsync(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.supplyAsync(java.util.function.Supplier)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture#supplyAsync(java.util.function.Supplier,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletableFuture.supplyAsync(java.util.function.Supplier, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CompletionException.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CompletionException.xml
index 70acf57111..f157c730c3 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CompletionException.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CompletionException.xml
@@ -86,12 +86,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>CompletionException</c> with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method)</param>
+        <summary>Constructs a <c>CompletionException</c> with the specified cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionException#CompletionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionException.CompletionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionException#CompletionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionException.CompletionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -122,12 +123,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a <c>CompletionException</c> with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <summary>Constructs a <c>CompletionException</c> with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionException#CompletionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionException.CompletionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionException#CompletionException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionException.CompletionException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -182,13 +184,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>CompletionException</c> with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method)</param>
+        <summary>Constructs a <c>CompletionException</c> with the specified detail
+            message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionException#CompletionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionException.CompletionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionException#CompletionException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionException.CompletionException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentHashMap.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentHashMap.xml
index 658931de73..b88c9030ec 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentHashMap.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentHashMap.xml
@@ -113,12 +113,12 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <summary>Creates a new, empty map with the default initial table size (16).</summary>
+        <param name="m">the map</param>
+        <summary>Creates a new map with the same mappings as the given map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -149,12 +149,15 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Creates a new, empty map with the default initial table size (16).</summary>
+        <param name="initialCapacity">The implementation performs internal
+            sizing to accommodate this many elements.</param>
+        <summary>Creates a new, empty map with an initial table size
+            accommodating the specified number of elements without the need
+            to dynamically resize.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -190,13 +193,18 @@
         <Parameter Name="loadFactor" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
-        <summary>Creates a new, empty map with the default initial table size (16).</summary>
+        <param name="initialCapacity">the initial capacity. The implementation
+            performs internal sizing to accommodate this many elements,
+            given the specified load factor.</param>
+        <param name="loadFactor">the load factor (table density) for
+            establishing the initial table size</param>
+        <summary>Creates a new, empty map with an initial table size based on
+            the given number of elements (<c>initialCapacity</c>) and
+            initial table density (<c>loadFactor</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap(int,%20float)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -255,14 +263,22 @@
         <Parameter Name="concurrencyLevel" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
-        <param name="concurrencyLevel">To be added.</param>
-        <summary>Creates a new, empty map with the default initial table size (16).</summary>
+        <param name="initialCapacity">the initial capacity. The implementation
+            performs internal sizing to accommodate this many elements,
+            given the specified load factor.</param>
+        <param name="loadFactor">the load factor (table density) for
+            establishing the initial table size</param>
+        <param name="concurrencyLevel">the estimated number of concurrently
+            updating threads. The implementation may use this value as
+            a sizing hint.</param>
+        <summary>Creates a new, empty map with an initial table size based on
+            the given number of elements (<c>initialCapacity</c>), table
+            density (<c>loadFactor</c>), and number of concurrently
+            updating threads (<c>concurrencyLevel</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#ConcurrentHashMap(int,%20float,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.ConcurrentHashMap(int, float, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -572,8 +588,6 @@
         <Parameter Name="action" Type="Java.Util.Functions.IBiConsumer" />
       </Parameters>
       <Docs>
-        <param name="parallelismThreshold">the (estimated) number of elements
-            needed for this operation to be executed in parallel</param>
         <param name="action">the action</param>
         <summary>Performs the given action for each (key, value).</summary>
         <remarks>
@@ -661,15 +675,19 @@
         <Parameter Name="action" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="transformer">To be added.</param>
         <param name="parallelismThreshold">the (estimated) number of elements
             needed for this operation to be executed in parallel</param>
+        <param name="transformer">a function returning the transformation
+            for an element, or null if there is no transformation (in
+            which case the action is not applied)</param>
         <param name="action">the action</param>
-        <summary>Performs the given action for each (key, value).</summary>
+        <param name="&lt;U&gt;&lt;U&gt;">the return type of the transformer</param>
+        <summary>Performs the given action for each non-null transformation
+            of each (key, value).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEach(long,%20java.util.function.BiConsumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEach(long, java.util.function.BiConsumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEach(long,%20java.util.function.BiFunction,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEach(long, java.util.function.BiFunction, java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
@@ -751,15 +769,19 @@
         <Parameter Name="action" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="transformer">To be added.</param>
         <param name="parallelismThreshold">the (estimated) number of elements
             needed for this operation to be executed in parallel</param>
+        <param name="transformer">a function returning the transformation
+            for an element, or null if there is no transformation (in
+            which case the action is not applied)</param>
         <param name="action">the action</param>
-        <summary>Performs the given action for each entry.</summary>
+        <param name="&lt;U&gt;&lt;U&gt;">the return type of the transformer</param>
+        <summary>Performs the given action for each non-null transformation
+            of each entry.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEachEntry(long,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEachEntry(long, java.util.function.Consumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEachEntry(long,%20java.util.function.Function,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEachEntry(long, java.util.function.Function, java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
@@ -841,15 +863,19 @@
         <Parameter Name="action" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="transformer">To be added.</param>
         <param name="parallelismThreshold">the (estimated) number of elements
             needed for this operation to be executed in parallel</param>
+        <param name="transformer">a function returning the transformation
+            for an element, or null if there is no transformation (in
+            which case the action is not applied)</param>
         <param name="action">the action</param>
-        <summary>Performs the given action for each key.</summary>
+        <param name="&lt;U&gt;&lt;U&gt;">the return type of the transformer</param>
+        <summary>Performs the given action for each non-null transformation
+            of each key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEachKey(long,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEachKey(long, java.util.function.Consumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEachKey(long,%20java.util.function.Function,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEachKey(long, java.util.function.Function, java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
@@ -931,15 +957,19 @@
         <Parameter Name="action" Type="Java.Util.Functions.IConsumer" />
       </Parameters>
       <Docs>
-        <param name="transformer">To be added.</param>
         <param name="parallelismThreshold">the (estimated) number of elements
             needed for this operation to be executed in parallel</param>
+        <param name="transformer">a function returning the transformation
+            for an element, or null if there is no transformation (in
+            which case the action is not applied)</param>
         <param name="action">the action</param>
-        <summary>Performs the given action for each value.</summary>
+        <param name="&lt;U&gt;&lt;U&gt;">the return type of the transformer</param>
+        <summary>Performs the given action for each non-null transformation
+            of each value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEachValue(long,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEachValue(long, java.util.function.Consumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#forEachValue(long,%20java.util.function.Function,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.forEachValue(long, java.util.function.Function, java.util.function.Consumer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1329,17 +1359,22 @@
         <Parameter Name="reducer" Type="Java.Util.Functions.IBiFunction" />
       </Parameters>
       <Docs>
-        <param name="transformer">To be added.</param>
         <param name="parallelismThreshold">the (estimated) number of elements
             needed for this operation to be executed in parallel</param>
+        <param name="transformer">a function returning the transformation
+            for an element, or null if there is no transformation (in
+            which case it is not combined)</param>
         <param name="reducer">a commutative associative combining function</param>
-        <summary>Returns the result of accumulating all entries using the
-            given reducer to combine values, or null if none.</summary>
-        <returns>the result of accumulating all entries</returns>
+        <param name="&lt;U&gt;&lt;U&gt;">the return type of the transformer</param>
+        <summary>Returns the result of accumulating the given transformation
+            of all entries using the given reducer to combine values,
+            or null if none.</summary>
+        <returns>the result of accumulating the given transformation
+            of all entries</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#reduceEntries(long,%20java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.reduceEntries(long, java.util.function.BiFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#reduceEntries(long,%20java.util.function.Function,%20java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.reduceEntries(long, java.util.function.Function, java.util.function.BiFunction)</code>.</a>
             </format>
           </para>
           <para>
@@ -1577,18 +1612,22 @@
         <Parameter Name="reducer" Type="Java.Util.Functions.IBiFunction" />
       </Parameters>
       <Docs>
-        <param name="transformer">To be added.</param>
         <param name="parallelismThreshold">the (estimated) number of elements
             needed for this operation to be executed in parallel</param>
+        <param name="transformer">a function returning the transformation
+            for an element, or null if there is no transformation (in
+            which case it is not combined)</param>
         <param name="reducer">a commutative associative combining function</param>
-        <summary>Returns the result of accumulating all keys using the given
-            reducer to combine values, or null if none.</summary>
-        <returns>the result of accumulating all keys using the given
-            reducer to combine values, or null if none</returns>
+        <param name="&lt;U&gt;&lt;U&gt;">the return type of the transformer</param>
+        <summary>Returns the result of accumulating the given transformation
+            of all keys using the given reducer to combine values, or
+            null if none.</summary>
+        <returns>the result of accumulating the given transformation
+            of all keys</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#reduceKeys(long,%20java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.reduceKeys(long, java.util.function.BiFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#reduceKeys(long,%20java.util.function.Function,%20java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.reduceKeys(long, java.util.function.Function, java.util.function.BiFunction)</code>.</a>
             </format>
           </para>
           <para>
@@ -1978,17 +2017,22 @@
         <Parameter Name="reducer" Type="Java.Util.Functions.IBiFunction" />
       </Parameters>
       <Docs>
-        <param name="transformer">To be added.</param>
         <param name="parallelismThreshold">the (estimated) number of elements
             needed for this operation to be executed in parallel</param>
+        <param name="transformer">a function returning the transformation
+            for an element, or null if there is no transformation (in
+            which case it is not combined)</param>
         <param name="reducer">a commutative associative combining function</param>
-        <summary>Returns the result of accumulating all values using the
-            given reducer to combine values, or null if none.</summary>
-        <returns>the result of accumulating all values</returns>
+        <param name="&lt;U&gt;&lt;U&gt;">the return type of the transformer</param>
+        <summary>Returns the result of accumulating the given transformation
+            of all values using the given reducer to combine values, or
+            null if none.</summary>
+        <returns>the result of accumulating the given transformation
+            of all values</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#reduceValues(long,%20java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.reduceValues(long, java.util.function.BiFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#reduceValues(long,%20java.util.function.Function,%20java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.reduceValues(long, java.util.function.Function, java.util.function.BiFunction)</code>.</a>
             </format>
           </para>
           <para>
@@ -2179,15 +2223,15 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">value expected to be associated with the specified key</param>
         <param name="key">the key that needs to be removed</param>
-        <summary>Removes the key (and its corresponding value) from this map.</summary>
+        <param name="value">value expected to be associated with the specified key</param>
+        <summary>[TODO: @inheritDoc]</summary>
         <returns>the previous value associated with <c>key</c>, or
                     <c>null</c> if there was no mapping for <c>key</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#remove(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.remove(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#remove(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.remove(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -2284,7 +2328,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#replace(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.replace(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap#replace(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentHashMap.replace(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedDeque.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedDeque.xml
index 82b9f4f1dd..118f0fa3db 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedDeque.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedDeque.xml
@@ -115,12 +115,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs an empty deque.</summary>
+        <param name="c">the collection of elements to initially contain</param>
+        <summary>Constructs a deque initially containing the elements of
+            the given collection, added in traversal order of the
+            collection's iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque#ConcurrentLinkedDeque()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentLinkedDeque.ConcurrentLinkedDeque()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque#ConcurrentLinkedDeque(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentLinkedDeque.ConcurrentLinkedDeque(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedQueue.xml
index a028c2b1bd..ea02aa765e 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentLinkedQueue.xml
@@ -114,12 +114,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates a <c>ConcurrentLinkedQueue</c> that is initially empty.</summary>
+        <param name="c">the collection of elements to initially contain</param>
+        <summary>Creates a <c>ConcurrentLinkedQueue</c>
+            initially containing the elements of the given collection,
+            added in traversal order of the collection's iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedQueue#ConcurrentLinkedQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentLinkedQueue.ConcurrentLinkedQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedQueue#ConcurrentLinkedQueue(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentLinkedQueue.ConcurrentLinkedQueue(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentSkipListMap.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentSkipListMap.xml
index 2a5b327149..2f94aadc97 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentSkipListMap.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ConcurrentSkipListMap.xml
@@ -110,13 +110,15 @@
         <Parameter Name="comparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="comparator">To be added.</param>
-        <summary>Constructs a new, empty map, sorted according to the
-            Comparable natural ordering of the keys.</summary>
+        <param name="comparator">the comparator that will be used to order this map.
+                   If <c>null</c>, the Comparable natural
+                   ordering of the keys will be used.</param>
+        <summary>Constructs a new, empty map, sorted according to the specified
+            comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#ConcurrentSkipListMap()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.ConcurrentSkipListMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#ConcurrentSkipListMap(java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.ConcurrentSkipListMap(java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -147,13 +149,14 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <summary>Constructs a new, empty map, sorted according to the
-            Comparable natural ordering of the keys.</summary>
+        <param name="m">the map whose mappings are to be placed in this map</param>
+        <summary>Constructs a new map containing the same mappings as the given map,
+            sorted according to the Comparable natural ordering of
+            the keys.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#ConcurrentSkipListMap()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.ConcurrentSkipListMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#ConcurrentSkipListMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.ConcurrentSkipListMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -1268,15 +1271,15 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">value expected to be associated with the specified key</param>
         <param name="key">key for which mapping should be removed</param>
-        <summary>Removes the mapping for the specified key from this map if present.</summary>
+        <param name="value">value expected to be associated with the specified key</param>
+        <summary>[TODO: @inheritDoc]</summary>
         <returns>the previous value associated with the specified key, or
                     <c>null</c> if there was no mapping for the key</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#remove(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.remove(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#remove(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.remove(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1369,7 +1372,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#replace(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.replace(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap#replace(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentSkipListMap.replace(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArrayList.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArrayList.xml
index 56869e9f0f..6ae8b6b7d6 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArrayList.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArrayList.xml
@@ -122,12 +122,13 @@
         <Parameter Name="toCopyIn" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="toCopyIn">To be added.</param>
-        <summary>Creates an empty list.</summary>
+        <param name="toCopyIn">the array (a copy of this array is used as the
+                   internal array)</param>
+        <summary>Creates a list holding a copy of the given array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#CopyOnWriteArrayList()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.CopyOnWriteArrayList()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#CopyOnWriteArrayList(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.CopyOnWriteArrayList(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -158,12 +159,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates an empty list.</summary>
+        <param name="c">the collection of initially held elements</param>
+        <summary>Creates a list containing the elements of the specified
+            collection, in the order they are returned by the collection's
+            iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#CopyOnWriteArrayList()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.CopyOnWriteArrayList()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#CopyOnWriteArrayList(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.CopyOnWriteArrayList(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -223,14 +226,14 @@
         <Parameter Name="e" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <summary>Inserts the specified element at the specified position in this
-            list.</summary>
-        <returns>To be added.</returns>
+        <param name="e">element to be appended to this list</param>
+        <summary>Appends the specified element to the end of this list.</summary>
+        <returns>
+          <c>true</c> (as specified by <c>Collection#add</c>)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#add(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.add(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#add(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.add(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -312,17 +315,16 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="index">index at which to insert the first element
-                   from the specified collection</param>
         <param name="c">collection containing elements to be added to this list</param>
-        <summary>Inserts all of the elements in the specified collection into this
-            list, starting at the specified position.</summary>
+        <summary>Appends all of the elements in the specified collection to the end
+            of this list, in the order that they are returned by the specified
+            collection's iterator.</summary>
         <returns>
           <c>true</c> if this list changed as a result of the call</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#addAll(int,%20java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.addAll(int, java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#addAll(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.addAll(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -779,14 +781,18 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="index">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="e">element to search for</param>
+        <param name="index">index to start searching from</param>
+        <summary>Returns the index of the first occurrence of the specified element in
+            this list, searching forwards from <c>index</c>, or returns -1 if
+            the element is not found.</summary>
+        <returns>the index of the first occurrence of the element in
+                    this list at position <c>index</c> or later in the list;
+                    <c>-1</c> if the element is not found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#indexOf(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.indexOf(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#indexOf(java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.indexOf(java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -981,14 +987,18 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="index">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="e">element to search for</param>
+        <param name="index">index to start searching backwards from</param>
+        <summary>Returns the index of the last occurrence of the specified element in
+            this list, searching backwards from <c>index</c>, or returns -1 if
+            the element is not found.</summary>
+        <returns>the index of the last occurrence of the element at position
+                    less than or equal to <c>index</c> in this list;
+                    -1 if the element is not found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#lastIndexOf(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.lastIndexOf(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#lastIndexOf(java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.lastIndexOf(java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1072,7 +1082,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#listIterator()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.listIterator()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#listIterator(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.listIterator(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1110,13 +1120,15 @@
         <Parameter Name="o" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="o">the object to remove.</param>
-        <summary>Removes the element at the specified position in this list.</summary>
-        <returns>To be added.</returns>
+        <param name="o">element to be removed from this list, if present</param>
+        <summary>Removes the first occurrence of the specified element from this list,
+            if it is present.</summary>
+        <returns>
+          <c>true</c> if this list contained the specified element</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#remove(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.remove(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#remove(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.remove(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1670,14 +1682,17 @@
         <Parameter Name="a" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <summary>Returns an array containing all of the elements in this list
-            in proper sequence (from first to last element).</summary>
+        <param name="a">the array into which the elements of the list are to
+                     be stored, if it is big enough; otherwise, a new array of the
+                     same runtime type is allocated for this purpose.</param>
+        <summary>Returns an array containing all of the elements in this list in
+            proper sequence (from first to last element); the runtime type of
+            the returned array is that of the specified array.</summary>
         <returns>an array containing all the elements in this list</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#toArray()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.toArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList#toArray(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArrayList.toArray(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArraySet.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArraySet.xml
index 3ab3c16d99..77a59b2712 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArraySet.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CopyOnWriteArraySet.xml
@@ -106,12 +106,13 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates an empty set.</summary>
+        <param name="c">the collection of elements to initially contain</param>
+        <summary>Creates a set containing all of the elements of the specified
+            collection.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArraySet#CopyOnWriteArraySet()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArraySet.CopyOnWriteArraySet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArraySet#CopyOnWriteArraySet(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CopyOnWriteArraySet.CopyOnWriteArraySet(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CountDownLatch.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CountDownLatch.xml
index 9336f6af5b..2cc0172d27 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CountDownLatch.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CountDownLatch.xml
@@ -166,12 +166,15 @@
         <param name="timeout">the maximum time to wait</param>
         <param name="unit">the time unit of the <c>timeout</c> argument</param>
         <summary>Causes the current thread to wait until the latch has counted down to
-            zero, unless the thread is Thread#interrupt interrupted.</summary>
-        <returns>To be added.</returns>
+            zero, unless the thread is Thread#interrupt interrupted,
+            or the specified waiting time elapses.</summary>
+        <returns>
+          <c>true</c> if the count reached zero and <c>false</c>
+                    if the waiting time elapsed before the count reached zero</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch#await()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CountDownLatch.await()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch#await(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CountDownLatch.await(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CountedCompleter.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CountedCompleter.xml
index 484f08455b..e5ab3bc348 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CountedCompleter.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CountedCompleter.xml
@@ -91,13 +91,13 @@
         <Parameter Name="completer" Type="Java.Util.Concurrent.CountedCompleter" />
       </Parameters>
       <Docs>
-        <param name="completer">To be added.</param>
-        <summary>Creates a new CountedCompleter with no completer
+        <param name="completer">this task's completer, or <c>null</c> if none</param>
+        <summary>Creates a new CountedCompleter with the given completer
             and an initial pending count of zero.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter#CountedCompleter()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CountedCompleter.CountedCompleter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter#CountedCompleter(java.util.concurrent.CountedCompleter)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CountedCompleter.CountedCompleter(java.util.concurrent.CountedCompleter)</code>.</a>
             </format>
           </para>
           <para>
@@ -129,14 +129,14 @@
         <Parameter Name="initialPendingCount" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="completer">To be added.</param>
-        <param name="initialPendingCount">To be added.</param>
-        <summary>Creates a new CountedCompleter with no completer
-            and an initial pending count of zero.</summary>
+        <param name="completer">this task's completer, or <c>null</c> if none</param>
+        <param name="initialPendingCount">the initial pending count</param>
+        <summary>Creates a new CountedCompleter with the given completer
+            and initial pending count.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter#CountedCompleter()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CountedCompleter.CountedCompleter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter#CountedCompleter(java.util.concurrent.CountedCompleter,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CountedCompleter.CountedCompleter(java.util.concurrent.CountedCompleter, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/CyclicBarrier.xml b/docs/Mono.Android/en/Java.Util.Concurrent/CyclicBarrier.xml
index e6f15d27f0..6119a38c4b 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/CyclicBarrier.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/CyclicBarrier.xml
@@ -98,16 +98,18 @@
         <Parameter Name="barrierAction" Type="Java.Lang.IRunnable" />
       </Parameters>
       <Docs>
-        <param name="barrierAction">To be added.</param>
         <param name="parties">the number of threads that must invoke <c>#await</c>
                    before the barrier is tripped</param>
+        <param name="barrierAction">the command to execute when the barrier is
+                   tripped, or <c>null</c> if there is no action</param>
         <summary>Creates a new <c>CyclicBarrier</c> that will trip when the
-            given number of parties (threads) are waiting upon it, and
-            does not perform a predefined action when the barrier is tripped.</summary>
+            given number of parties (threads) are waiting upon it, and which
+            will execute the given barrier action when the barrier is tripped,
+            performed by the last thread entering the barrier.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier#CyclicBarrier(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CyclicBarrier.CyclicBarrier(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier#CyclicBarrier(int,%20java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CyclicBarrier.CyclicBarrier(int, java.lang.Runnable)</code>.</a>
             </format>
           </para>
           <para>
@@ -220,14 +222,14 @@
         <param name="timeout">the time to wait for the barrier</param>
         <param name="unit">the time unit of the timeout parameter</param>
         <summary>Waits until all #getParties parties have invoked
-            <c>await</c> on this barrier.</summary>
+            <c>await</c> on this barrier, or the specified waiting time elapses.</summary>
         <returns>the arrival index of the current thread, where index
                     <c>getParties() - 1</c> indicates the first
                     to arrive and zero indicates the last to arrive</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier#await()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CyclicBarrier.await()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier#await(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CyclicBarrier.await(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/DelayQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/DelayQueue.xml
index ebf3eb91b6..e22b49d4d7 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/DelayQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/DelayQueue.xml
@@ -116,12 +116,13 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates a new <c>DelayQueue</c> that is initially empty.</summary>
+        <param name="c">the collection of elements to initially contain</param>
+        <summary>Creates a <c>DelayQueue</c> initially containing the elements of the
+            given collection of <c>Delayed</c> instances.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/DelayQueue#DelayQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.DelayQueue.DelayQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/DelayQueue#DelayQueue(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.DelayQueue.DelayQueue(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -232,7 +233,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/DelayQueue#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.DelayQueue.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/DelayQueue#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.DelayQueue.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -392,9 +393,9 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
+        <param name="e">the element to add</param>
         <param name="timeout">To be added.</param>
         <param name="unit">To be added.</param>
-        <param name="e">the element to add</param>
         <summary>Inserts the specified element into this delay queue.</summary>
         <returns>
           <c>true</c>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/Exchanger.xml b/docs/Mono.Android/en/Java.Util.Concurrent/Exchanger.xml
index 6d91bd6206..7a98acf90d 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/Exchanger.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/Exchanger.xml
@@ -164,18 +164,18 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="x">the object to exchange</param>
+        <param name="timeout">the maximum time to wait</param>
+        <param name="unit">the time unit of the <c>timeout</c> argument</param>
         <summary>Waits for another thread to arrive at this exchange point (unless
-            the current thread is Thread#interrupt interrupted),
-            and then transfers the given object to it, receiving its object
-            in return.</summary>
+            the current thread is Thread#interrupt interrupted or
+            the specified waiting time elapses), and then transfers the given
+            object to it, receiving its object in return.</summary>
         <returns>the object provided by the other thread</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Exchanger#exchange(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Exchanger.exchange(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Exchanger#exchange(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Exchanger.exchange(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ExecutionException.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ExecutionException.xml
index 4406abdd44..3941a3f586 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ExecutionException.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ExecutionException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an <c>ExecutionException</c> with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method)</param>
+        <summary>Constructs an <c>ExecutionException</c> with the specified cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutionException#ExecutionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutionException.ExecutionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutionException#ExecutionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutionException.ExecutionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +126,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs an <c>ExecutionException</c> with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <summary>Constructs an <c>ExecutionException</c> with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutionException#ExecutionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutionException.ExecutionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutionException#ExecutionException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutionException.ExecutionException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +188,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs an <c>ExecutionException</c> with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method)</param>
+        <summary>Constructs an <c>ExecutionException</c> with the specified detail
+            message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutionException#ExecutionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutionException.ExecutionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutionException#ExecutionException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutionException.ExecutionException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ExecutorCompletionService.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ExecutorCompletionService.xml
index 7f16fddf36..748130ce7c 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ExecutorCompletionService.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ExecutorCompletionService.xml
@@ -113,15 +113,19 @@
         <Parameter Name="completionQueue" Type="Java.Util.Concurrent.IBlockingQueue" />
       </Parameters>
       <Docs>
-        <param name="completionQueue">To be added.</param>
         <param name="executor">the executor to use</param>
+        <param name="completionQueue">the queue to use as the completion queue
+                   normally one dedicated for use by this service. This
+                   queue is treated as unbounded -- failed attempted
+                   <c>Queue.add</c> operations for completed tasks cause
+                   them not to be retrievable.</param>
         <summary>Creates an ExecutorCompletionService using the supplied
-            executor for base task execution and a
-            <c>LinkedBlockingQueue</c> as a completion queue.</summary>
+            executor for base task execution and the supplied queue as its
+            completion queue.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService#ExecutorCompletionService(java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorCompletionService.ExecutorCompletionService(java.util.concurrent.Executor)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService#ExecutorCompletionService(java.util.concurrent.Executor,%20java.util.concurrent.BlockingQueue)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorCompletionService.ExecutorCompletionService(java.util.concurrent.Executor, java.util.concurrent.BlockingQueue)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/Executors.xml b/docs/Mono.Android/en/Java.Util.Concurrent/Executors.xml
index 9d1efd55af..60cb549b7e 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/Executors.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/Executors.xml
@@ -125,15 +125,14 @@
         <Parameter Name="action" Type="Java.Security.IPrivilegedAction" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <param name="task">the task to run</param>
+        <param name="action">the privileged action to run</param>
         <summary>Returns a <c>Callable</c> object that, when
-            called, runs the given task and returns <c>null</c>.</summary>
+            called, runs the given privileged action and returns its result.</summary>
         <returns>a callable object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#callable(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.callable(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#callable(java.security.PrivilegedAction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.callable(java.security.PrivilegedAction)</code>.</a>
             </format>
           </para>
           <para>
@@ -167,15 +166,15 @@
         <Parameter Name="action" Type="Java.Security.IPrivilegedExceptionAction" />
       </Parameters>
       <Docs>
-        <param name="action">To be added.</param>
-        <param name="task">the task to run</param>
+        <param name="action">the privileged exception action to run</param>
         <summary>Returns a <c>Callable</c> object that, when
-            called, runs the given task and returns <c>null</c>.</summary>
+            called, runs the given privileged exception action and returns
+            its result.</summary>
         <returns>a callable object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#callable(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.callable(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#callable(java.security.PrivilegedExceptionAction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.callable(java.security.PrivilegedExceptionAction)</code>.</a>
             </format>
           </para>
           <para>
@@ -214,15 +213,16 @@
         <Parameter Name="result" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="result">To be added.</param>
         <param name="task">the task to run</param>
+        <param name="result">the result to return</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the result</param>
         <summary>Returns a <c>Callable</c> object that, when
-            called, runs the given task and returns <c>null</c>.</summary>
+            called, runs the given task and returns the given result.</summary>
         <returns>a callable object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#callable(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.callable(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#callable(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.callable(java.lang.Runnable, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -368,12 +368,13 @@
         <param name="threadFactory">the factory to use when creating new threads</param>
         <summary>Creates a thread pool that creates new threads as needed, but
             will reuse previously constructed threads when they are
-            available.</summary>
+            available, and uses the provided
+            ThreadFactory to create new threads when needed.</summary>
         <returns>the newly created thread pool</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newCachedThreadPool()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newCachedThreadPool()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newCachedThreadPool(java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newCachedThreadPool(java.util.concurrent.ThreadFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -454,15 +455,16 @@
         <Parameter Name="threadFactory" Type="Java.Util.Concurrent.IThreadFactory" />
       </Parameters>
       <Docs>
-        <param name="threadFactory">the factory to use when creating new threads</param>
         <param name="nThreads">the number of threads in the pool</param>
+        <param name="threadFactory">the factory to use when creating new threads</param>
         <summary>Creates a thread pool that reuses a fixed number of threads
-            operating off a shared unbounded queue.</summary>
+            operating off a shared unbounded queue, using the provided
+            ThreadFactory to create new threads when needed.</summary>
         <returns>the newly created thread pool</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newFixedThreadPool(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newFixedThreadPool(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newFixedThreadPool(int,%20java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newFixedThreadPool(int, java.util.concurrent.ThreadFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -544,17 +546,17 @@
         <Parameter Name="threadFactory" Type="Java.Util.Concurrent.IThreadFactory" />
       </Parameters>
       <Docs>
-        <param name="threadFactory">the factory to use when the executor
- creates a new thread</param>
         <param name="corePoolSize">the number of threads to keep in the pool,
             even if they are idle</param>
+        <param name="threadFactory">the factory to use when the executor
+            creates a new thread</param>
         <summary>Creates a thread pool that can schedule commands to run after a
             given delay, or to execute periodically.</summary>
         <returns>a newly created scheduled thread pool</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newScheduledThreadPool(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newScheduledThreadPool(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newScheduledThreadPool(int,%20java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newScheduledThreadPool(int, java.util.concurrent.ThreadFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -632,14 +634,15 @@
       </Parameters>
       <Docs>
         <param name="threadFactory">the factory to use when creating new
- threads</param>
+            threads</param>
         <summary>Creates an Executor that uses a single worker thread operating
-            off an unbounded queue.</summary>
+            off an unbounded queue, and uses the provided ThreadFactory to
+            create a new thread when needed.</summary>
         <returns>the newly created single-threaded Executor</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newSingleThreadExecutor()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newSingleThreadExecutor()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newSingleThreadExecutor(java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newSingleThreadExecutor(java.util.concurrent.ThreadFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -716,14 +719,14 @@
       </Parameters>
       <Docs>
         <param name="threadFactory">the factory to use when creating new
- threads</param>
+            threads</param>
         <summary>Creates a single-threaded executor that can schedule commands
             to run after a given delay, or to execute periodically.</summary>
-        <returns>the newly created scheduled executor</returns>
+        <returns>a newly created scheduled executor</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newSingleThreadScheduledExecutor()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newSingleThreadScheduledExecutor()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newSingleThreadScheduledExecutor(java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newSingleThreadScheduledExecutor(java.util.concurrent.ThreadFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -799,15 +802,15 @@
         <Parameter Name="parallelism" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parallelism">To be added.</param>
-        <summary>Creates a work-stealing thread pool using the number of
-            Runtime#availableProcessors available processors
-            as its target parallelism level.</summary>
+        <param name="parallelism">the targeted parallelism level</param>
+        <summary>Creates a thread pool that maintains enough threads to support
+            the given parallelism level, and may use multiple queues to
+            reduce contention.</summary>
         <returns>the newly created thread pool</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newWorkStealingPool()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newWorkStealingPool()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Executors#newWorkStealingPool(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Executors.newWorkStealingPool(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinPool.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinPool.xml
index a9662bf4f6..0dffd5e516 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinPool.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinPool.xml
@@ -86,13 +86,14 @@
         <Parameter Name="parallelism" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parallelism">To be added.</param>
-        <summary>Creates a <c>ForkJoinPool</c> with parallelism equal to <c>java.lang.Runtime#availableProcessors</c>, using the #defaultForkJoinWorkerThreadFactory default thread factory,
+        <param name="parallelism">the parallelism level</param>
+        <summary>Creates a <c>ForkJoinPool</c> with the indicated parallelism
+            level, the #defaultForkJoinWorkerThreadFactory default thread factory,
             no UncaughtExceptionHandler, and non-async LIFO processing mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool#ForkJoinPool()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinPool.ForkJoinPool()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool#ForkJoinPool(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinPool.ForkJoinPool(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -562,12 +563,12 @@
         <Parameter Name="task" Type="Java.Util.Concurrent.ForkJoinTask" />
       </Parameters>
       <Docs>
-        <param name="task">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="task">the task</param>
+        <summary>Arranges for (asynchronous) execution of the given task.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool#execute(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinPool.execute(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool#execute(java.util.concurrent.ForkJoinTask)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinPool.execute(java.util.concurrent.ForkJoinTask)</code>.</a>
             </format>
           </para>
           <para>
@@ -1282,13 +1283,14 @@
         <Parameter Name="task" Type="Java.Util.Concurrent.ForkJoinTask" />
       </Parameters>
       <Docs>
-        <param name="task">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="task">the task to submit</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the task's result</param>
+        <summary>Submits a ForkJoinTask for execution.</summary>
+        <returns>the task</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool#submit(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinPool.submit(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool#submit(java.util.concurrent.ForkJoinTask)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinPool.submit(java.util.concurrent.ForkJoinTask)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinTask.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinTask.xml
index 8d13fcfaf0..4ca4a62b0c 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinTask.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ForkJoinTask.xml
@@ -169,16 +169,17 @@
         <Parameter Name="callable" Type="Java.Util.Concurrent.ICallable" />
       </Parameters>
       <Docs>
-        <param name="callable">To be added.</param>
-        <param name="runnable">the runnable action</param>
-        <summary>Returns a new <c>ForkJoinTask</c> that performs the <c>run</c>
-            method of the given <c>Runnable</c> as its action, and returns
-            a null result upon <c>#join</c>.</summary>
+        <param name="callable">the callable action</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the callable's result</param>
+        <summary>Returns a new <c>ForkJoinTask</c> that performs the <c>call</c>
+            method of the given <c>Callable</c> as its action, and returns
+            its result upon <c>#join</c>, translating any checked exceptions
+            encountered into <c>RuntimeException</c>.</summary>
         <returns>the task</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#adapt(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.adapt(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#adapt(java.util.concurrent.Callable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.adapt(java.util.concurrent.Callable)</code>.</a>
             </format>
           </para>
           <para>
@@ -217,16 +218,17 @@
         <Parameter Name="result" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="result">To be added.</param>
         <param name="runnable">the runnable action</param>
+        <param name="result">the result upon completion</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the result</param>
         <summary>Returns a new <c>ForkJoinTask</c> that performs the <c>run</c>
             method of the given <c>Runnable</c> as its action, and returns
-            a null result upon <c>#join</c>.</summary>
+            the given result upon <c>#join</c>.</summary>
         <returns>the task</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#adapt(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.adapt(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#adapt(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.adapt(java.lang.Runnable, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -640,13 +642,13 @@
       <Docs>
         <param name="timeout">the maximum time to wait</param>
         <param name="unit">the time unit of the timeout argument</param>
-        <summary>Waits if necessary for the computation to complete, and then
-            retrieves its result.</summary>
+        <summary>Waits if necessary for at most the given time for the computation
+            to complete, and then retrieves its result, if available.</summary>
         <returns>the computed result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#get()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#get(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.get(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -811,7 +813,6 @@
       </Parameters>
       <Docs>
         <param name="tasks">the collection of tasks</param>
-        <param name="&lt;T&gt;&lt;T&gt;">the type of the values returned from the tasks</param>
         <summary>Forks all tasks in the specified collection, returning when
             <c>isDone</c> holds for each task or an (unchecked) exception
             is encountered, in which case the exception is rethrown.</summary>
@@ -901,18 +902,16 @@
         <Parameter Name="t2" Type="Java.Util.Concurrent.ForkJoinTask" />
       </Parameters>
       <Docs>
-        <param name="t1">To be added.</param>
-        <param name="t2">To be added.</param>
-        <param name="tasks">the collection of tasks</param>
-        <param name="&lt;T&gt;&lt;T&gt;">the type of the values returned from the tasks</param>
-        <summary>Forks all tasks in the specified collection, returning when
-            <c>isDone</c> holds for each task or an (unchecked) exception
-            is encountered, in which case the exception is rethrown.</summary>
+        <param name="t1">the first task</param>
+        <param name="t2">the second task</param>
+        <summary>Forks the given tasks, returning when <c>isDone</c> holds for
+            each task or an (unchecked) exception is encountered, in which
+            case the exception is rethrown.</summary>
         <returns>the tasks argument, to simplify usage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#invokeAll(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.invokeAll(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask#invokeAll(java.util.concurrent.ForkJoinTask,%20java.util.concurrent.ForkJoinTask)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ForkJoinTask.invokeAll(java.util.concurrent.ForkJoinTask, java.util.concurrent.ForkJoinTask)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/FutureTask.xml b/docs/Mono.Android/en/Java.Util.Concurrent/FutureTask.xml
index 2e58e1bc1e..091160b015 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/FutureTask.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/FutureTask.xml
@@ -78,19 +78,13 @@
         <Parameter Name="callable" Type="Java.Util.Concurrent.ICallable" />
       </Parameters>
       <Docs>
-        <param name="callable">To be added.</param>
-        <param name="runnable">the runnable task</param>
-        <param name="result">the result to return on successful completion. If
-            you don't need a particular result, consider using
-            constructions of the form:
-            <c>Future&lt;?&gt; f = new FutureTask&lt;Void&gt;(runnable, null)</c></param>
+        <param name="callable">the callable task</param>
         <summary>Creates a <c>FutureTask</c> that will, upon running, execute the
-            given <c>Runnable</c>, and arrange that <c>get</c> will return the
-            given result on successful completion.</summary>
+            given <c>Callable</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/FutureTask#FutureTask(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.FutureTask.FutureTask(java.lang.Runnable, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/FutureTask#FutureTask(java.util.concurrent.Callable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.FutureTask.FutureTask(java.util.concurrent.Callable)</code>.</a>
             </format>
           </para>
           <para>
@@ -323,7 +317,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/FutureTask#get()" title="Reference documentation">Java documentation for <code>java.util.concurrent.FutureTask.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/FutureTask#get(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.FutureTask.get(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingDeque.xml b/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingDeque.xml
index 615ca45e3a..377fe233b5 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingDeque.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingDeque.xml
@@ -420,15 +420,15 @@
         <param name="unit">To be added.</param>
         <param name="e">the element to add</param>
         <summary>Inserts the specified element into the queue represented by this deque
-            (in other words, at the tail of this deque) if it is possible to do so
-            immediately without violating capacity restrictions, returning
-            <c>true</c> upon success and <c>false</c> if no space is currently
-            available.</summary>
-        <returns>To be added.</returns>
+            (in other words, at the tail of this deque), waiting up to the
+            specified wait time if necessary for space to become available.</summary>
+        <returns>
+          <c>true</c> if the element was added to this deque, else
+                    <c>false</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -510,18 +510,21 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="e">the element to add</param>
-        <summary>Inserts the specified element at the front of this deque if it is
-            possible to do so immediately without violating capacity restrictions,
-            returning <c>true</c> upon success and <c>false</c> if no space is
-            currently available.</summary>
-        <returns>To be added.</returns>
+        <param name="timeout">how long to wait before giving up, in units of
+                   <c>unit</c></param>
+        <param name="unit">a <c>TimeUnit</c> determining how to interpret the
+                   <c>timeout</c> parameter</param>
+        <summary>Inserts the specified element at the front of this deque,
+            waiting up to the specified wait time if necessary for space to
+            become available.</summary>
+        <returns>
+          <c>true</c> if successful, or <c>false</c> if
+                    the specified waiting time elapses before space is available</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#offerFirst(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.offerFirst(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#offerFirst(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.offerFirst(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -603,18 +606,21 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="e">the element to add</param>
-        <summary>Inserts the specified element at the end of this deque if it is
-            possible to do so immediately without violating capacity restrictions,
-            returning <c>true</c> upon success and <c>false</c> if no space is
-            currently available.</summary>
-        <returns>To be added.</returns>
+        <param name="timeout">how long to wait before giving up, in units of
+                   <c>unit</c></param>
+        <param name="unit">a <c>TimeUnit</c> determining how to interpret the
+                   <c>timeout</c> parameter</param>
+        <summary>Inserts the specified element at the end of this deque,
+            waiting up to the specified wait time if necessary for space to
+            become available.</summary>
+        <returns>
+          <c>true</c> if successful, or <c>false</c> if
+                    the specified waiting time elapses before space is available</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#offerLast(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.offerLast(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#offerLast(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.offerLast(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -745,13 +751,14 @@
         <param name="unit">a <c>TimeUnit</c> determining how to interpret the
         <c>timeout</c> parameter</param>
         <summary>Retrieves and removes the head of the queue represented by this deque
-            (in other words, the first element of this deque), or returns
-            <c>null</c> if this deque is empty.</summary>
-        <returns>the head of this deque, or <c>null</c> if this deque is empty</returns>
+            (in other words, the first element of this deque), waiting up to the
+            specified wait time if necessary for an element to become available.</summary>
+        <returns>the head of this deque, or <c>null</c> if the
+                    specified waiting time elapses before an element is available</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#poll()" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.poll()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#poll(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.poll(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -1107,13 +1114,13 @@
       </Parameters>
       <Docs>
         <param name="o">element to be removed from this deque, if present</param>
-        <summary>Retrieves and removes the head of the queue represented by this deque
-            (in other words, the first element of this deque).</summary>
-        <returns>the head of the queue represented by this deque</returns>
+        <summary>Removes the first occurrence of the specified element from this deque.</summary>
+        <returns>
+          <c>true</c> if this deque changed as a result of the call</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#remove()" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.remove()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque#remove(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingDeque.remove(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingQueue.xml
index 606de427c7..77590f3894 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/IBlockingQueue.xml
@@ -221,15 +221,15 @@
         <Parameter Name="maxElements" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="maxElements">To be added.</param>
         <param name="c">the collection to transfer elements into</param>
-        <summary>Removes all available elements from this queue and adds them
-            to the given collection.</summary>
+        <param name="maxElements">the maximum number of elements to transfer</param>
+        <summary>Removes at most the given number of available elements from
+            this queue and adds them to the given collection.</summary>
         <returns>the number of elements transferred</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingQueue.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingQueue.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -313,20 +313,20 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="e">the element to add</param>
-        <summary>Inserts the specified element into this queue if it is possible to do
-            so immediately without violating capacity restrictions, returning
-            <c>true</c> upon success and <c>false</c> if no space is currently
-            available.</summary>
+        <param name="timeout">how long to wait before giving up, in units of
+                   <c>unit</c></param>
+        <param name="unit">a <c>TimeUnit</c> determining how to interpret the
+                   <c>timeout</c> parameter</param>
+        <summary>Inserts the specified element into this queue, waiting up to the
+            specified wait time if necessary for space to become available.</summary>
         <returns>
-          <c>true</c> if the element was added to this queue, else
-                    <c>false</c></returns>
+          <c>true</c> if successful, or <c>false</c> if
+                    the specified waiting time elapses before space is available</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingQueue.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.BlockingQueue.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionService.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionService.xml
index 3f429014f5..7cbada3838 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionService.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionService.xml
@@ -111,17 +111,19 @@
       </Parameters>
       <Docs>
         <param name="timeout">how long to wait before giving up, in units of
-        <c>unit</c></param>
+                   <c>unit</c></param>
         <param name="unit">a <c>TimeUnit</c> determining how to interpret the
-        <c>timeout</c> parameter</param>
+                   <c>timeout</c> parameter</param>
         <summary>Retrieves and removes the Future representing the next
-            completed task, or <c>null</c> if none are present.</summary>
-        <returns>the Future representing the next completed task, or
-                    <c>null</c> if none are present</returns>
+            completed task, waiting if necessary up to the specified wait
+            time if none are yet present.</summary>
+        <returns>the Future representing the next completed task or
+                    <c>null</c> if the specified waiting time elapses
+                    before one is present</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionService#poll()" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionService.poll()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionService#poll(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionService.poll(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -159,16 +161,13 @@
       </Parameters>
       <Docs>
         <param name="task">the task to submit</param>
-        <param name="result">the result to return upon successful completion</param>
-        <summary>Submits a Runnable task for execution and returns a Future
-            representing that task.</summary>
-        <returns>a Future representing pending completion of the task,
-                    and whose <c>get()</c> method will return the given
-                    result value upon completion</returns>
+        <summary>Submits a value-returning task for execution and returns a Future
+            representing the pending results of the task.</summary>
+        <returns>a Future representing pending completion of the task</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionService#submit(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionService.submit(java.lang.Runnable, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionService#submit(java.util.concurrent.Callable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionService.submit(java.util.concurrent.Callable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionStage.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionStage.xml
index 02329c41a1..cac2b4b464 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionStage.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ICompletionStage.xml
@@ -161,19 +161,19 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="other">the other CompletionStage</param>
         <param name="action">the action to perform before completing the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <summary>Returns a new CompletionStage that, when either this or the
-            other given stage complete normally, is executed using this
-            stage's default asynchronous execution facility, with the
-            corresponding result as argument to the supplied action.</summary>
+            other given stage complete normally, is executed using the
+            supplied executor, with the corresponding result as argument to
+            the supplied action.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#acceptEitherAsync(java.util.concurrent.CompletionStage,%20java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.acceptEitherAsync(java.util.concurrent.CompletionStage, java.util.function.Consumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#acceptEitherAsync(java.util.concurrent.CompletionStage,%20java.util.function.Consumer,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.acceptEitherAsync(java.util.concurrent.CompletionStage, java.util.function.Consumer, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -314,20 +314,20 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="other">the other CompletionStage</param>
         <param name="fn">the function to use to compute the value of the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <param name="&lt;U&gt;&lt;U&gt;">the function's return type</param>
         <summary>Returns a new CompletionStage that, when either this or the
-            other given stage complete normally, is executed using this
-            stage's default asynchronous execution facility, with the
-            corresponding result as argument to the supplied function.</summary>
+            other given stage complete normally, is executed using the
+            supplied executor, with the corresponding result as argument to
+            the supplied function.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#applyToEitherAsync(java.util.concurrent.CompletionStage,%20java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.applyToEitherAsync(java.util.concurrent.CompletionStage, java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#applyToEitherAsync(java.util.concurrent.CompletionStage,%20java.util.function.Function,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.applyToEitherAsync(java.util.concurrent.CompletionStage, java.util.function.Function, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -507,19 +507,19 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="fn">the function to use to compute the value of the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <param name="&lt;U&gt;&lt;U&gt;">the function's return type</param>
         <summary>Returns a new CompletionStage that, when this stage completes
-            either normally or exceptionally, is executed using this stage's
-            default asynchronous execution facility, with this stage's
-            result and exception as arguments to the supplied function.</summary>
+            either normally or exceptionally, is executed using the
+            supplied executor, with this stage's result and exception as
+            arguments to the supplied function.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#handleAsync(java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.handleAsync(java.util.function.BiFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#handleAsync(java.util.function.BiFunction,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.handleAsync(java.util.function.BiFunction, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -644,18 +644,18 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="other">the other CompletionStage</param>
         <param name="action">the action to perform before completing the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <summary>Returns a new CompletionStage that, when this and the other
             given stage both complete normally, executes the given action
-            using this stage's default asynchronous execution facility.</summary>
+            using the supplied executor.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#runAfterBothAsync(java.util.concurrent.CompletionStage,%20java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.runAfterBothAsync(java.util.concurrent.CompletionStage, java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#runAfterBothAsync(java.util.concurrent.CompletionStage,%20java.lang.Runnable,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.runAfterBothAsync(java.util.concurrent.CompletionStage, java.lang.Runnable, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -780,18 +780,18 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="other">the other CompletionStage</param>
         <param name="action">the action to perform before completing the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <summary>Returns a new CompletionStage that, when either this or the
             other given stage complete normally, executes the given action
-            using this stage's default asynchronous execution facility.</summary>
+            using the supplied executor.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#runAfterEitherAsync(java.util.concurrent.CompletionStage,%20java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.runAfterEitherAsync(java.util.concurrent.CompletionStage, java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#runAfterEitherAsync(java.util.concurrent.CompletionStage,%20java.lang.Runnable,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.runAfterEitherAsync(java.util.concurrent.CompletionStage, java.lang.Runnable, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -913,18 +913,17 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="action">the action to perform before completing the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <summary>Returns a new CompletionStage that, when this stage completes
-            normally, is executed using this stage's default asynchronous
-            execution facility, with this stage's result as the argument to
-            the supplied action.</summary>
+            normally, is executed using the supplied Executor, with this
+            stage's result as the argument to the supplied action.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenAcceptAsync(java.util.function.Consumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenAcceptAsync(java.util.function.Consumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenAcceptAsync(java.util.function.Consumer,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenAcceptAsync(java.util.function.Consumer, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1065,20 +1064,20 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="other">the other CompletionStage</param>
         <param name="action">the action to perform before completing the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <param name="&lt;U&gt;&lt;U&gt;">the type of the other CompletionStage's result</param>
         <summary>Returns a new CompletionStage that, when this and the other
-            given stage both complete normally, is executed using this
-            stage's default asynchronous execution facility, with the two
-            results as arguments to the supplied action.</summary>
+            given stage both complete normally, is executed using the
+            supplied executor, with the two results as arguments to the
+            supplied action.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenAcceptBothAsync(java.util.concurrent.CompletionStage,%20java.util.function.BiConsumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenAcceptBothAsync(java.util.concurrent.CompletionStage, java.util.function.BiConsumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenAcceptBothAsync(java.util.concurrent.CompletionStage,%20java.util.function.BiConsumer,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenAcceptBothAsync(java.util.concurrent.CompletionStage, java.util.function.BiConsumer, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1214,19 +1213,18 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="fn">the function to use to compute the value of the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <param name="&lt;U&gt;&lt;U&gt;">the function's return type</param>
         <summary>Returns a new CompletionStage that, when this stage completes
-            normally, is executed using this stage's default asynchronous
-            execution facility, with this stage's result as the argument to
-            the supplied function.</summary>
+            normally, is executed using the supplied Executor, with this
+            stage's result as the argument to the supplied function.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenApplyAsync(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenApplyAsync(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenApplyAsync(java.util.function.Function,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenApplyAsync(java.util.function.Function, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1369,21 +1367,21 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="other">the other CompletionStage</param>
         <param name="fn">the function to use to compute the value of the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <param name="&lt;U&gt;&lt;U&gt;">the type of the other CompletionStage's result</param>
         <param name="&lt;V&gt;&lt;V&gt;">the function's return type</param>
         <summary>Returns a new CompletionStage that, when this and the other
-            given stage both complete normally, is executed using this
-            stage's default asynchronous execution facility, with the two
-            results as arguments to the supplied function.</summary>
+            given stage both complete normally, is executed using the
+            supplied executor, with the two results as arguments to the
+            supplied function.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenCombineAsync(java.util.concurrent.CompletionStage,%20java.util.function.BiFunction)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenCombineAsync(java.util.concurrent.CompletionStage, java.util.function.BiFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenCombineAsync(java.util.concurrent.CompletionStage,%20java.util.function.BiFunction,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenCombineAsync(java.util.concurrent.CompletionStage, java.util.function.BiFunction, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1516,18 +1514,17 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="fn">the function to use to compute another CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <param name="&lt;U&gt;&lt;U&gt;">the type of the returned CompletionStage's result</param>
         <summary>Returns a new CompletionStage that is completed with the same
             value as the CompletionStage returned by the given function,
-            executed using this stage's default asynchronous execution
-            facility.</summary>
+            executed using the supplied Executor.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenComposeAsync(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenComposeAsync(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenComposeAsync(java.util.function.Function,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenComposeAsync(java.util.function.Function, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1647,17 +1644,16 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="action">the action to perform before completing the
             returned CompletionStage</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <summary>Returns a new CompletionStage that, when this stage completes
-            normally, executes the given action using this stage's default
-            asynchronous execution facility.</summary>
+            normally, executes the given action using the supplied Executor.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenRunAsync(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenRunAsync(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#thenRunAsync(java.lang.Runnable,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.thenRunAsync(java.lang.Runnable, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
@@ -1813,16 +1809,16 @@
         <Parameter Name="executor" Type="Java.Util.Concurrent.IExecutor" />
       </Parameters>
       <Docs>
-        <param name="executor">To be added.</param>
         <param name="action">the action to perform</param>
+        <param name="executor">the executor to use for asynchronous execution</param>
         <summary>Returns a new CompletionStage with the same result or exception as
-            this stage, that executes the given action using this stage's
-            default asynchronous execution facility when this stage completes.</summary>
+            this stage, that executes the given action using the supplied
+            Executor when this stage completes.</summary>
         <returns>the new CompletionStage</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#whenCompleteAsync(java.util.function.BiConsumer)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.whenCompleteAsync(java.util.function.BiConsumer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/CompletionStage#whenCompleteAsync(java.util.function.BiConsumer,%20java.util.concurrent.Executor)" title="Reference documentation">Java documentation for <code>java.util.concurrent.CompletionStage.whenCompleteAsync(java.util.function.BiConsumer, java.util.concurrent.Executor)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/IConcurrentMap.xml b/docs/Mono.Android/en/Java.Util.Concurrent/IConcurrentMap.xml
index ec09ad0341..d580f05466 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/IConcurrentMap.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/IConcurrentMap.xml
@@ -490,20 +490,16 @@
         <Parameter Name="newValue" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="oldValue">To be added.</param>
-        <param name="newValue">To be added.</param>
         <param name="key">key with which the specified value is associated</param>
-        <param name="value">value to be associated with the specified key</param>
-        <summary>Replaces the entry for a key only if currently mapped to some value.</summary>
-        <returns>the previous value associated with the specified key, or
-                    <c>null</c> if there was no mapping for the key.
-                    (A <c>null</c> return can also indicate that the map
-                    previously associated <c>null</c> with the key,
-                    if the implementation supports null values.)</returns>
+        <param name="oldValue">value expected to be associated with the specified key</param>
+        <param name="newValue">value to be associated with the specified key</param>
+        <summary>Replaces the entry for a key only if currently mapped to a given value.</summary>
+        <returns>
+          <c>true</c> if the value was replaced</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap#replace(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentMap.replace(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap#replace(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ConcurrentMap.replace(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/IExecutorService.xml b/docs/Mono.Android/en/Java.Util.Concurrent/IExecutorService.xml
index c44ffaa013..47d79acd9b 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/IExecutorService.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/IExecutorService.xml
@@ -172,19 +172,22 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="tasks">the collection of tasks</param>
+        <param name="timeout">the maximum time to wait</param>
+        <param name="unit">the time unit of the timeout argument</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the values returned from the tasks</param>
         <summary>Executes the given tasks, returning a list of Futures holding
-            their status and results when all complete.</summary>
+            their status and results
+            when all complete or the timeout expires, whichever happens first.</summary>
         <returns>a list of Futures representing the tasks, in the same
                     sequential order as produced by the iterator for the
-                    given task list, each of which has completed</returns>
+                    given task list. If the operation did not time out,
+                    each task will have completed. If it did time out, some
+                    of these tasks will not have completed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#invokeAll(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.invokeAll(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#invokeAll(java.util.Collection,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.invokeAll(java.util.Collection, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -270,9 +273,9 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="tasks">the collection of tasks</param>
+        <param name="timeout">the maximum time to wait</param>
+        <param name="unit">the time unit of the timeout argument</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the values returned from the tasks</param>
         <summary>Executes the given tasks, returning the result
             of one that has completed successfully (i.</summary>
@@ -280,7 +283,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#invokeAny(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.invokeAny(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#invokeAny(java.util.Collection,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.invokeAny(java.util.Collection, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -499,13 +502,14 @@
       </Parameters>
       <Docs>
         <param name="task">the task to submit</param>
-        <summary>Submits a Runnable task for execution and returns a Future
-            representing that task.</summary>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the task's result</param>
+        <summary>Submits a value-returning task for execution and returns a
+            Future representing the pending results of the task.</summary>
         <returns>a Future representing pending completion of the task</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#submit(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.submit(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#submit(java.util.concurrent.Callable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.submit(java.util.concurrent.Callable)</code>.</a>
             </format>
           </para>
           <para>
@@ -544,15 +548,16 @@
         <Parameter Name="result" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="result">To be added.</param>
         <param name="task">the task to submit</param>
+        <param name="result">the result to return</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the result</param>
         <summary>Submits a Runnable task for execution and returns a Future
             representing that task.</summary>
         <returns>a Future representing pending completion of the task</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#submit(java.lang.Runnable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.submit(java.lang.Runnable)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ExecutorService#submit(java.lang.Runnable,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ExecutorService.submit(java.lang.Runnable, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/IFuture.xml b/docs/Mono.Android/en/Java.Util.Concurrent/IFuture.xml
index d83912b126..24ff9b3bbb 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/IFuture.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/IFuture.xml
@@ -165,13 +165,13 @@
       <Docs>
         <param name="timeout">the maximum time to wait</param>
         <param name="unit">the time unit of the timeout argument</param>
-        <summary>Waits if necessary for the computation to complete, and then
-            retrieves its result.</summary>
+        <summary>Waits if necessary for at most the given time for the computation
+            to complete, and then retrieves its result, if available.</summary>
         <returns>the computed result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Future#get()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Future.get()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Future#get(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Future.get(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/IScheduledExecutorService.xml b/docs/Mono.Android/en/Java.Util.Concurrent/IScheduledExecutorService.xml
index f168a09f3c..b1eac7aee8 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/IScheduledExecutorService.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/IScheduledExecutorService.xml
@@ -129,19 +129,17 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="callable">To be added.</param>
-        <param name="command">the task to execute</param>
+        <param name="callable">the function to execute</param>
         <param name="delay">the time from now to delay execution</param>
         <param name="unit">the time unit of the delay parameter</param>
-        <summary>Creates and executes a one-shot action that becomes enabled
-            after the given delay.</summary>
-        <returns>a ScheduledFuture representing pending completion of
-                    the task and whose <c>get()</c> method will return
-                    <c>null</c> upon completion</returns>
+        <param name="&lt;V&gt;&lt;V&gt;">the type of the callable's result</param>
+        <summary>Creates and executes a ScheduledFuture that becomes enabled after the
+            given delay.</summary>
+        <returns>a ScheduledFuture that can be used to extract result or cancel</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService#schedule(java.lang.Runnable,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledExecutorService.schedule(java.lang.Runnable, long, java.util.concurrent.TimeUnit)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService#schedule(java.util.concurrent.Callable,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledExecutorService.schedule(java.util.concurrent.Callable, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ITransferQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ITransferQueue.xml
index bb1eca17a0..695794b42c 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ITransferQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ITransferQueue.xml
@@ -193,17 +193,21 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="e">the element to transfer</param>
-        <summary>Transfers the element to a waiting consumer immediately, if possible.</summary>
+        <param name="timeout">how long to wait before giving up, in units of
+                   <c>unit</c></param>
+        <param name="unit">a <c>TimeUnit</c> determining how to interpret the
+                   <c>timeout</c> parameter</param>
+        <summary>Transfers the element to a consumer if it is possible to do so
+            before the timeout elapses.</summary>
         <returns>
-          <c>true</c> if the element was transferred, else
-                    <c>false</c></returns>
+          <c>true</c> if successful, or <c>false</c> if
+                    the specified waiting time elapses before completion,
+                    in which case the element is not left enqueued</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/TransferQueue#tryTransfer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.TransferQueue.tryTransfer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/TransferQueue#tryTransfer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.TransferQueue.tryTransfer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingDeque.xml b/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingDeque.xml
index 4f8814f5c3..b42a79dc64 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingDeque.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingDeque.xml
@@ -125,13 +125,15 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
+        <param name="c">the collection of elements to initially contain</param>
         <summary>Creates a <c>LinkedBlockingDeque</c> with a capacity of
-            <c>Integer#MAX_VALUE</c>.</summary>
+            <c>Integer#MAX_VALUE</c>, initially containing the elements of
+            the given collection, added in traversal order of the
+            collection's iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#LinkedBlockingDeque()" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.LinkedBlockingDeque()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#LinkedBlockingDeque(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.LinkedBlockingDeque(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -162,13 +164,12 @@
         <Parameter Name="capacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="capacity">To be added.</param>
-        <summary>Creates a <c>LinkedBlockingDeque</c> with a capacity of
-            <c>Integer#MAX_VALUE</c>.</summary>
+        <param name="capacity">the capacity of this deque</param>
+        <summary>Creates a <c>LinkedBlockingDeque</c> with the given (fixed) capacity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#LinkedBlockingDeque()" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.LinkedBlockingDeque()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#LinkedBlockingDeque(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.LinkedBlockingDeque(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -408,7 +409,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -655,7 +656,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -745,7 +746,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#offerFirst(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.offerFirst(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#offerFirst(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.offerFirst(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -835,7 +836,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#offerLast(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.offerLast(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque#offerLast(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingDeque.offerLast(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingQueue.xml
index 67f4f5a30b..adb47a0753 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/LinkedBlockingQueue.xml
@@ -119,13 +119,15 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
+        <param name="c">the collection of elements to initially contain</param>
         <summary>Creates a <c>LinkedBlockingQueue</c> with a capacity of
-            <c>Integer#MAX_VALUE</c>.</summary>
+            <c>Integer#MAX_VALUE</c>, initially containing the elements of the
+            given collection,
+            added in traversal order of the collection's iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#LinkedBlockingQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.LinkedBlockingQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#LinkedBlockingQueue(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.LinkedBlockingQueue(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,13 +158,12 @@
         <Parameter Name="capacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="capacity">To be added.</param>
-        <summary>Creates a <c>LinkedBlockingQueue</c> with a capacity of
-            <c>Integer#MAX_VALUE</c>.</summary>
+        <param name="capacity">the capacity of this queue</param>
+        <summary>Creates a <c>LinkedBlockingQueue</c> with the given (fixed) capacity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#LinkedBlockingQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.LinkedBlockingQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#LinkedBlockingQueue(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.LinkedBlockingQueue(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -277,7 +278,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -440,15 +441,15 @@
         <param name="e">To be added.</param>
         <param name="timeout">To be added.</param>
         <param name="unit">To be added.</param>
-        <summary>Inserts the specified element at the tail of this queue if it is
-            possible to do so immediately without exceeding the queue's capacity,
-            returning <c>true</c> upon success and <c>false</c> if this queue
-            is full.</summary>
-        <returns>To be added.</returns>
+        <summary>Inserts the specified element at the tail of this queue, waiting if
+            necessary up to the specified wait time for space to become available.</summary>
+        <returns>
+          <c>true</c> if successful, or <c>false</c> if
+                    the specified waiting time elapses before space is available</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedBlockingQueue.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/LinkedTransferQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/LinkedTransferQueue.xml
index ce8258aaaf..d4ced7d012 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/LinkedTransferQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/LinkedTransferQueue.xml
@@ -118,12 +118,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates an initially empty <c>LinkedTransferQueue</c>.</summary>
+        <param name="c">the collection of elements to initially contain</param>
+        <summary>Creates a <c>LinkedTransferQueue</c>
+            initially containing the elements of the given collection,
+            added in traversal order of the collection's iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#LinkedTransferQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.LinkedTransferQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#LinkedTransferQueue(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.LinkedTransferQueue(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -234,7 +236,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -428,11 +430,13 @@
         <param name="unit">To be added.</param>
         <summary>Inserts the specified element at the tail of this queue.</summary>
         <returns>
-          <c>true</c> (as specified by <c>Queue#offer</c>)</returns>
+          <c>true</c> (as specified by
+             <c>java.util.concurrent.BlockingQueue#offer(Object,long,TimeUnit)
+             BlockingQueue.offer</c>)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -924,12 +928,13 @@
         <param name="e">To be added.</param>
         <param name="timeout">To be added.</param>
         <param name="unit">To be added.</param>
-        <summary>Transfers the element to a waiting consumer immediately, if possible.</summary>
+        <summary>Transfers the element to a consumer if it is possible to do so
+            before the timeout elapses.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#tryTransfer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.tryTransfer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue#tryTransfer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.LinkedTransferQueue.tryTransfer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/Phaser.xml b/docs/Mono.Android/en/Java.Util.Concurrent/Phaser.xml
index ff86e75392..285d4e51ae 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/Phaser.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/Phaser.xml
@@ -89,13 +89,12 @@
         <Parameter Name="parent" Type="Java.Util.Concurrent.Phaser" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
-        <summary>Creates a new phaser with no initially registered parties, no
-            parent, and initial phase number 0.</summary>
+        <param name="parent">the parent phaser</param>
+        <summary>Equivalent to <c>#Phaser(Phaser, int) Phaser(parent, 0)</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#Phaser()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.Phaser()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#Phaser(java.util.concurrent.Phaser)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.Phaser(java.util.concurrent.Phaser)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +125,14 @@
         <Parameter Name="parties" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parties">To be added.</param>
-        <summary>Creates a new phaser with no initially registered parties, no
-            parent, and initial phase number 0.</summary>
+        <param name="parties">the number of parties required to advance to the
+            next phase</param>
+        <summary>Creates a new phaser with the given number of registered
+            unarrived parties, no parent, and initial phase number 0.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#Phaser()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.Phaser()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#Phaser(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.Phaser(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -167,14 +167,15 @@
         <Parameter Name="parties" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
-        <param name="parties">To be added.</param>
-        <summary>Creates a new phaser with no initially registered parties, no
-            parent, and initial phase number 0.</summary>
+        <param name="parent">the parent phaser</param>
+        <param name="parties">the number of parties required to advance to the
+            next phase</param>
+        <summary>Creates a new phaser with the given parent and number of
+            registered unarrived parties.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#Phaser()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.Phaser()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#Phaser(java.util.concurrent.Phaser,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.Phaser(java.util.concurrent.Phaser, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -491,25 +492,24 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">how long to wait before giving up, in units of
-        <c>unit</c></param>
-        <param name="unit">a <c>TimeUnit</c> determining how to interpret the
-        <c>timeout</c> parameter</param>
         <param name="phase">an arrival phase number, or negative value if
             terminated; this argument is normally the value returned by a
             previous call to <c>arrive</c> or <c>arriveAndDeregister</c>.</param>
+        <param name="timeout">how long to wait before giving up, in units of
+                   <c>unit</c></param>
+        <param name="unit">a <c>TimeUnit</c> determining how to interpret the
+                   <c>timeout</c> parameter</param>
         <summary>Awaits the phase of this phaser to advance from the given phase
-            value, throwing <c>InterruptedException</c> if interrupted
-            while waiting, or returning immediately if the current phase is
-            not equal to the given phase value or this phaser is
-            terminated.</summary>
+            value or the given timeout to elapse, throwing <c>InterruptedException</c> if interrupted while waiting, or
+            returning immediately if the current phase is not equal to the
+            given phase value or this phaser is terminated.</summary>
         <returns>the next arrival phase number, or the argument if it is
             negative, or the (negative) #getPhase() current phase
             if terminated</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#awaitAdvanceInterruptibly(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.awaitAdvanceInterruptibly(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Phaser#awaitAdvanceInterruptibly(int,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Phaser.awaitAdvanceInterruptibly(int, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/PriorityBlockingQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/PriorityBlockingQueue.xml
index 0e0beb6363..16d8fb93ba 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/PriorityBlockingQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/PriorityBlockingQueue.xml
@@ -121,14 +121,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates a <c>PriorityBlockingQueue</c> with the default
-            initial capacity (11) that orders its elements according to
-            their Comparable natural ordering.</summary>
+        <param name="c">the collection whose elements are to be placed
+                    into this priority queue</param>
+        <summary>Creates a <c>PriorityBlockingQueue</c> containing the elements
+            in the specified collection.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#PriorityBlockingQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.PriorityBlockingQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#PriorityBlockingQueue(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.PriorityBlockingQueue(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -159,14 +159,14 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Creates a <c>PriorityBlockingQueue</c> with the default
-            initial capacity (11) that orders its elements according to
-            their Comparable natural ordering.</summary>
+        <param name="initialCapacity">the initial capacity for this priority queue</param>
+        <summary>Creates a <c>PriorityBlockingQueue</c> with the specified
+            initial capacity that orders its elements according to their
+            Comparable natural ordering.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#PriorityBlockingQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.PriorityBlockingQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#PriorityBlockingQueue(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.PriorityBlockingQueue(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,15 +202,17 @@
         <Parameter Name="comparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="comparator">To be added.</param>
-        <summary>Creates a <c>PriorityBlockingQueue</c> with the default
-            initial capacity (11) that orders its elements according to
-            their Comparable natural ordering.</summary>
+        <param name="initialCapacity">the initial capacity for this priority queue</param>
+        <param name="comparator">the comparator that will be used to order this
+                    priority queue.  If <c>null</c>, the Comparable
+                    natural ordering of the elements will be used.</param>
+        <summary>Creates a <c>PriorityBlockingQueue</c> with the specified initial
+            capacity that orders its elements according to the specified
+            comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#PriorityBlockingQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.PriorityBlockingQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#PriorityBlockingQueue(int,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.PriorityBlockingQueue(int, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -363,7 +365,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -521,16 +523,17 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
-        <param name="timeout">To be added.</param>
-        <param name="unit">To be added.</param>
         <param name="e">the element to add</param>
+        <param name="timeout">This parameter is ignored as the method never blocks</param>
+        <param name="unit">This parameter is ignored as the method never blocks</param>
         <summary>Inserts the specified element into this priority queue.</summary>
         <returns>
-          <c>true</c> (as specified by <c>Queue#offer</c>)</returns>
+          <c>true</c> (as specified by
+             <c>BlockingQueue#offer(Object,long,TimeUnit) BlockingQueue.offer</c>)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.PriorityBlockingQueue.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/RejectedExecutionException.xml b/docs/Mono.Android/en/Java.Util.Concurrent/RejectedExecutionException.xml
index da9b4b20b7..2cf54dd778 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/RejectedExecutionException.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/RejectedExecutionException.xml
@@ -88,12 +88,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>RejectedExecutionException</c> with no detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method)</param>
+        <summary>Constructs a <c>RejectedExecutionException</c> with the
+            specified cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionException#RejectedExecutionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.RejectedExecutionException.RejectedExecutionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionException#RejectedExecutionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.RejectedExecutionException.RejectedExecutionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +127,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a <c>RejectedExecutionException</c> with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <summary>Constructs a <c>RejectedExecutionException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionException#RejectedExecutionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.RejectedExecutionException.RejectedExecutionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionException#RejectedExecutionException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.concurrent.RejectedExecutionException.RejectedExecutionException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,15 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a <c>RejectedExecutionException</c> with no detail message.</summary>
+        <param name="message">the detail message</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>#getCause()</c> method)</param>
+        <summary>Constructs a <c>RejectedExecutionException</c> with the
+            specified detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionException#RejectedExecutionException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.RejectedExecutionException.RejectedExecutionException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionException#RejectedExecutionException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.concurrent.RejectedExecutionException.RejectedExecutionException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ScheduledThreadPoolExecutor.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ScheduledThreadPoolExecutor.xml
index af6441a2cc..493768b5de 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ScheduledThreadPoolExecutor.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ScheduledThreadPoolExecutor.xml
@@ -115,15 +115,16 @@
         <Parameter Name="handler" Type="Java.Util.Concurrent.IRejectedExecutionHandler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="corePoolSize">the number of threads to keep in the pool, even
                    if they are idle, unless <c>allowCoreThreadTimeOut</c> is set</param>
+        <param name="handler">the handler to use when execution is blocked
+                   because the thread bounds and queue capacities are reached</param>
         <summary>Creates a new <c>ScheduledThreadPoolExecutor</c> with the
-            given core pool size.</summary>
+            given initial parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#ScheduledThreadPoolExecutor(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.ScheduledThreadPoolExecutor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#ScheduledThreadPoolExecutor(int,%20java.util.concurrent.RejectedExecutionHandler)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.ScheduledThreadPoolExecutor(int, java.util.concurrent.RejectedExecutionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -159,15 +160,16 @@
         <Parameter Name="threadFactory" Type="Java.Util.Concurrent.IThreadFactory" />
       </Parameters>
       <Docs>
-        <param name="threadFactory">To be added.</param>
         <param name="corePoolSize">the number of threads to keep in the pool, even
                    if they are idle, unless <c>allowCoreThreadTimeOut</c> is set</param>
+        <param name="threadFactory">the factory to use when the executor
+                   creates a new thread</param>
         <summary>Creates a new <c>ScheduledThreadPoolExecutor</c> with the
-            given core pool size.</summary>
+            given initial parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#ScheduledThreadPoolExecutor(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.ScheduledThreadPoolExecutor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#ScheduledThreadPoolExecutor(int,%20java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.ScheduledThreadPoolExecutor(int, java.util.concurrent.ThreadFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -227,16 +229,18 @@
         <Parameter Name="handler" Type="Java.Util.Concurrent.IRejectedExecutionHandler" />
       </Parameters>
       <Docs>
-        <param name="threadFactory">To be added.</param>
-        <param name="handler">To be added.</param>
         <param name="corePoolSize">the number of threads to keep in the pool, even
                    if they are idle, unless <c>allowCoreThreadTimeOut</c> is set</param>
+        <param name="threadFactory">the factory to use when the executor
+                   creates a new thread</param>
+        <param name="handler">the handler to use when execution is blocked
+                   because the thread bounds and queue capacities are reached</param>
         <summary>Creates a new <c>ScheduledThreadPoolExecutor</c> with the
-            given core pool size.</summary>
+            given initial parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#ScheduledThreadPoolExecutor(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.ScheduledThreadPoolExecutor(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#ScheduledThreadPoolExecutor(int,%20java.util.concurrent.ThreadFactory,%20java.util.concurrent.RejectedExecutionHandler)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.ScheduledThreadPoolExecutor(int, java.util.concurrent.ThreadFactory, java.util.concurrent.RejectedExecutionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -381,16 +385,15 @@
         <Parameter Name="task" Type="Java.Util.Concurrent.IRunnableScheduledFuture" />
       </Parameters>
       <Docs>
-        <param name="callable">To be added.</param>
-        <param name="runnable">the submitted Runnable</param>
-        <param name="task">the task created to execute the runnable</param>
+        <param name="callable">the submitted Callable</param>
+        <param name="task">the task created to execute the callable</param>
         <param name="&lt;V&gt;&lt;V&gt;">the type of the task's result</param>
-        <summary>Modifies or replaces the task used to execute a runnable.</summary>
-        <returns>a task that can execute the runnable</returns>
+        <summary>Modifies or replaces the task used to execute a callable.</summary>
+        <returns>a task that can execute the callable</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#decorateTask(java.lang.Runnable,%20java.util.concurrent.RunnableScheduledFuture)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.decorateTask(java.lang.Runnable, java.util.concurrent.RunnableScheduledFuture)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#decorateTask(java.util.concurrent.Callable,%20java.util.concurrent.RunnableScheduledFuture)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.decorateTask(java.util.concurrent.Callable, java.util.concurrent.RunnableScheduledFuture)</code>.</a>
             </format>
           </para>
           <para>
@@ -635,7 +638,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#schedule(java.lang.Runnable,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.schedule(java.lang.Runnable, long, java.util.concurrent.TimeUnit)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor#schedule(java.util.concurrent.Callable,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ScheduledThreadPoolExecutor.schedule(java.util.concurrent.Callable, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/Semaphore.xml b/docs/Mono.Android/en/Java.Util.Concurrent/Semaphore.xml
index bb5538d360..a0c41cfe59 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/Semaphore.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/Semaphore.xml
@@ -108,16 +108,19 @@
         <Parameter Name="fair" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fair">To be added.</param>
         <param name="permits">the initial number of permits available.
                    This value may be negative, in which case releases
                    must occur before any acquires will be granted.</param>
+        <param name="fair">
+          <c>true</c> if this semaphore will guarantee
+                   first-in first-out granting of permits under contention,
+                   else <c>false</c></param>
         <summary>Creates a <c>Semaphore</c> with the given number of
-            permits and nonfair fairness setting.</summary>
+            permits and the given fairness setting.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#Semaphore(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.Semaphore(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#Semaphore(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.Semaphore(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -216,12 +219,13 @@
       </Parameters>
       <Docs>
         <param name="permits">the number of permits to acquire</param>
-        <summary>Acquires a permit from this semaphore, blocking until one is
-            available, or the thread is Thread#interrupt interrupted.</summary>
+        <summary>Acquires the given number of permits from this semaphore,
+            blocking until all are available,
+            or the thread is Thread#interrupt interrupted.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#acquire()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.acquire()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#acquire(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.acquire(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -298,12 +302,12 @@
       </Parameters>
       <Docs>
         <param name="permits">the number of permits to acquire</param>
-        <summary>Acquires a permit from this semaphore, blocking until one is
-            available.</summary>
+        <summary>Acquires the given number of permits from this semaphore,
+            blocking until all are available.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#acquireUninterruptibly()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.acquireUninterruptibly()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#acquireUninterruptibly(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.acquireUninterruptibly(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -682,11 +686,11 @@
       </Parameters>
       <Docs>
         <param name="permits">the number of permits to release</param>
-        <summary>Releases a permit, returning it to the semaphore.</summary>
+        <summary>Releases the given number of permits, returning them to the semaphore.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#release()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.release()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#release(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.release(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -827,15 +831,15 @@
       </Parameters>
       <Docs>
         <param name="permits">the number of permits to acquire</param>
-        <summary>Acquires a permit from this semaphore, only if one is available at the
-            time of invocation.</summary>
+        <summary>Acquires the given number of permits from this semaphore, only
+            if all are available at the time of invocation.</summary>
         <returns>
-          <c>true</c> if a permit was acquired and <c>false</c>
-                    otherwise</returns>
+          <c>true</c> if the permits were acquired and
+                    <c>false</c> otherwise</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#tryAcquire()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.tryAcquire()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#tryAcquire(int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.tryAcquire(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -875,15 +879,16 @@
       <Docs>
         <param name="timeout">the maximum time to wait for a permit</param>
         <param name="unit">the time unit of the <c>timeout</c> argument</param>
-        <summary>Acquires a permit from this semaphore, only if one is available at the
-            time of invocation.</summary>
+        <summary>Acquires a permit from this semaphore, if one becomes available
+            within the given waiting time and the current thread has not
+            been Thread#interrupt interrupted.</summary>
         <returns>
           <c>true</c> if a permit was acquired and <c>false</c>
-                    otherwise</returns>
+                    if the waiting time elapsed before a permit was acquired</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#tryAcquire()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.tryAcquire()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#tryAcquire(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.tryAcquire(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -925,15 +930,16 @@
         <param name="permits">the number of permits to acquire</param>
         <param name="timeout">the maximum time to wait for the permits</param>
         <param name="unit">the time unit of the <c>timeout</c> argument</param>
-        <summary>Acquires a permit from this semaphore, only if one is available at the
-            time of invocation.</summary>
+        <summary>Acquires the given number of permits from this semaphore, if all
+            become available within the given waiting time and the current
+            thread has not been Thread#interrupt interrupted.</summary>
         <returns>
-          <c>true</c> if a permit was acquired and <c>false</c>
-                    otherwise</returns>
+          <c>true</c> if all permits were acquired and <c>false</c>
+                    if the waiting time elapsed before all permits were acquired</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#tryAcquire()" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.tryAcquire()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/Semaphore#tryAcquire(int,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.Semaphore.tryAcquire(int, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/SynchronousQueue.xml b/docs/Mono.Android/en/Java.Util.Concurrent/SynchronousQueue.xml
index f232ac82de..705de89a13 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/SynchronousQueue.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/SynchronousQueue.xml
@@ -119,12 +119,13 @@
         <Parameter Name="fair" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fair">To be added.</param>
-        <summary>Creates a <c>SynchronousQueue</c> with nonfair access policy.</summary>
+        <param name="fair">if true, waiting threads contend in FIFO order for
+                   access; otherwise the order is unspecified.</param>
+        <summary>Creates a <c>SynchronousQueue</c> with the specified fairness policy.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#SynchronousQueue()" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.SynchronousQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#SynchronousQueue(boolean)" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.SynchronousQueue(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -236,7 +237,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#drainTo(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.drainTo(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#drainTo(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.drainTo(java.util.Collection, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -397,18 +398,18 @@
         <Parameter Name="unit" Type="Java.Util.Concurrent.TimeUnit" />
       </Parameters>
       <Docs>
+        <param name="e">the element to add</param>
         <param name="timeout">To be added.</param>
         <param name="unit">To be added.</param>
-        <param name="e">the element to add</param>
-        <summary>Inserts the specified element into this queue, if another thread is
-            waiting to receive it.</summary>
+        <summary>Inserts the specified element into this queue, waiting if necessary
+            up to the specified wait time for another thread to receive it.</summary>
         <returns>
-          <c>true</c> if the element was added to this queue, else
-                    <c>false</c></returns>
+          <c>true</c> if successful, or <c>false</c> if the
+                    specified waiting time elapses before a consumer appears</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#offer(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.offer(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#offer(java.lang.Object,%20long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.offer(java.lang.Object, long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
@@ -536,14 +537,15 @@
         <c>unit</c></param>
         <param name="unit">a <c>TimeUnit</c> determining how to interpret the
         <c>timeout</c> parameter</param>
-        <summary>Retrieves and removes the head of this queue, if another thread
-            is currently making an element available.</summary>
-        <returns>the head of this queue, or <c>null</c> if no
-                    element is available</returns>
+        <summary>Retrieves and removes the head of this queue, waiting
+            if necessary up to the specified wait time, for another thread
+            to insert it.</summary>
+        <returns>the head of this queue, or <c>null</c> if the
+                    specified waiting time elapses before an element is present</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#poll()" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.poll()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue#poll(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>java.util.concurrent.SynchronousQueue.poll(long, java.util.concurrent.TimeUnit)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ThreadLocalRandom.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ThreadLocalRandom.xml
index b53a0370e5..6a797b6a4e 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ThreadLocalRandom.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ThreadLocalRandom.xml
@@ -147,15 +147,14 @@
         <Parameter Name="bound" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>double</c> value between zero
-            (inclusive) and one (exclusive).</summary>
+        <param name="bound">the upper bound (exclusive).  Must be positive.</param>
+        <summary>Returns a pseudorandom <c>double</c> value between 0.</summary>
         <returns>a pseudorandom <c>double</c> value between zero
-                    (inclusive) and one (exclusive)</returns>
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextDouble()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextDouble()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextDouble(double)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextDouble(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -192,16 +191,16 @@
         <Parameter Name="bound" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="origin">To be added.</param>
+        <param name="origin">the least value returned</param>
         <param name="bound">the upper bound (exclusive)</param>
-        <summary>Returns a pseudorandom <c>double</c> value between zero
-            (inclusive) and one (exclusive).</summary>
-        <returns>a pseudorandom <c>double</c> value between zero
-                    (inclusive) and one (exclusive)</returns>
+        <summary>Returns a pseudorandom <c>double</c> value between the specified
+            origin (inclusive) and bound (exclusive).</summary>
+        <returns>a pseudorandom <c>double</c> value between the origin
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextDouble()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextDouble()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextDouble(double,%20double)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextDouble(double, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -239,14 +238,16 @@
         <Parameter Name="bound" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="origin">To be added.</param>
+        <param name="origin">the least value returned</param>
         <param name="bound">the upper bound (exclusive)</param>
-        <summary>Returns a pseudorandom <c>int</c> value.</summary>
-        <returns>a pseudorandom <c>int</c> value</returns>
+        <summary>Returns a pseudorandom <c>int</c> value between the specified
+            origin (inclusive) and the specified bound (exclusive).</summary>
+        <returns>a pseudorandom <c>int</c> value between the origin
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextInt()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextInt()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextInt(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextInt(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -283,13 +284,15 @@
         <Parameter Name="bound" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>long</c> value.</summary>
-        <returns>a pseudorandom <c>long</c> value</returns>
+        <param name="bound">the upper bound (exclusive).  Must be positive.</param>
+        <summary>Returns a pseudorandom <c>long</c> value between zero (inclusive)
+            and the specified bound (exclusive).</summary>
+        <returns>a pseudorandom <c>long</c> value between zero
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextLong()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextLong(long)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextLong(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -326,14 +329,16 @@
         <Parameter Name="bound" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="origin">To be added.</param>
+        <param name="origin">the least value returned</param>
         <param name="bound">the upper bound (exclusive)</param>
-        <summary>Returns a pseudorandom <c>long</c> value.</summary>
-        <returns>a pseudorandom <c>long</c> value</returns>
+        <summary>Returns a pseudorandom <c>long</c> value between the specified
+            origin (inclusive) and the specified bound (exclusive).</summary>
+        <returns>a pseudorandom <c>long</c> value between the origin
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextLong()" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom#nextLong(long,%20long)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadLocalRandom.nextLong(long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/ThreadPoolExecutor.xml b/docs/Mono.Android/en/Java.Util.Concurrent/ThreadPoolExecutor.xml
index da638ca80f..b1ee362ec6 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/ThreadPoolExecutor.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/ThreadPoolExecutor.xml
@@ -135,7 +135,6 @@
         <Parameter Name="handler" Type="Java.Util.Concurrent.IRejectedExecutionHandler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
         <param name="corePoolSize">the number of threads to keep in the pool, even
                    if they are idle, unless <c>allowCoreThreadTimeOut</c> is set</param>
         <param name="maximumPoolSize">the maximum number of threads to allow in the
@@ -147,12 +146,14 @@
         <param name="workQueue">the queue to use for holding tasks before they are
                    executed.  This queue will hold only the <c>Runnable</c>
                    tasks submitted by the <c>execute</c> method.</param>
+        <param name="handler">the handler to use when execution is blocked
+                   because the thread bounds and queue capacities are reached</param>
         <summary>Creates a new <c>ThreadPoolExecutor</c> with the given initial
-            parameters and default thread factory and rejected execution handler.</summary>
+            parameters and default thread factory.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor#ThreadPoolExecutor(int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.util.concurrent.BlockingQueue)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadPoolExecutor.ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor#ThreadPoolExecutor(int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.util.concurrent.BlockingQueue,%20java.util.concurrent.RejectedExecutionHandler)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadPoolExecutor.ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue, java.util.concurrent.RejectedExecutionHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,7 +189,6 @@
         <Parameter Name="threadFactory" Type="Java.Util.Concurrent.IThreadFactory" />
       </Parameters>
       <Docs>
-        <param name="threadFactory">To be added.</param>
         <param name="corePoolSize">the number of threads to keep in the pool, even
                    if they are idle, unless <c>allowCoreThreadTimeOut</c> is set</param>
         <param name="maximumPoolSize">the maximum number of threads to allow in the
@@ -200,12 +200,14 @@
         <param name="workQueue">the queue to use for holding tasks before they are
                    executed.  This queue will hold only the <c>Runnable</c>
                    tasks submitted by the <c>execute</c> method.</param>
+        <param name="threadFactory">the factory to use when the executor
+                   creates a new thread</param>
         <summary>Creates a new <c>ThreadPoolExecutor</c> with the given initial
-            parameters and default thread factory and rejected execution handler.</summary>
+            parameters and default rejected execution handler.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor#ThreadPoolExecutor(int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.util.concurrent.BlockingQueue)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadPoolExecutor.ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor#ThreadPoolExecutor(int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.util.concurrent.BlockingQueue,%20java.util.concurrent.ThreadFactory)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadPoolExecutor.ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue, java.util.concurrent.ThreadFactory)</code>.</a>
             </format>
           </para>
           <para>
@@ -242,8 +244,6 @@
         <Parameter Name="handler" Type="Java.Util.Concurrent.IRejectedExecutionHandler" />
       </Parameters>
       <Docs>
-        <param name="threadFactory">To be added.</param>
-        <param name="handler">To be added.</param>
         <param name="corePoolSize">the number of threads to keep in the pool, even
                    if they are idle, unless <c>allowCoreThreadTimeOut</c> is set</param>
         <param name="maximumPoolSize">the maximum number of threads to allow in the
@@ -255,12 +255,16 @@
         <param name="workQueue">the queue to use for holding tasks before they are
                    executed.  This queue will hold only the <c>Runnable</c>
                    tasks submitted by the <c>execute</c> method.</param>
+        <param name="threadFactory">the factory to use when the executor
+                   creates a new thread</param>
+        <param name="handler">the handler to use when execution is blocked
+                   because the thread bounds and queue capacities are reached</param>
         <summary>Creates a new <c>ThreadPoolExecutor</c> with the given initial
-            parameters and default thread factory and rejected execution handler.</summary>
+            parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor#ThreadPoolExecutor(int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.util.concurrent.BlockingQueue)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadPoolExecutor.ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor#ThreadPoolExecutor(int,%20int,%20long,%20java.util.concurrent.TimeUnit,%20java.util.concurrent.BlockingQueue,%20java.util.concurrent.ThreadFactory,%20java.util.concurrent.RejectedExecutionHandler)" title="Reference documentation">Java documentation for <code>java.util.concurrent.ThreadPoolExecutor.ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue, java.util.concurrent.ThreadFactory, java.util.concurrent.RejectedExecutionHandler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Concurrent/TimeoutException.xml b/docs/Mono.Android/en/Java.Util.Concurrent/TimeoutException.xml
index 3b2fb68a54..8cc2ed119c 100644
--- a/docs/Mono.Android/en/Java.Util.Concurrent/TimeoutException.xml
+++ b/docs/Mono.Android/en/Java.Util.Concurrent/TimeoutException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a <c>TimeoutException</c> with no specified detail
+        <param name="message">the detail message</param>
+        <summary>Constructs a <c>TimeoutException</c> with the specified detail
             message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/concurrent/TimeoutException#TimeoutException()" title="Reference documentation">Java documentation for <code>java.util.concurrent.TimeoutException.TimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/concurrent/TimeoutException#TimeoutException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.concurrent.TimeoutException.TimeoutException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/Attributes.xml b/docs/Mono.Android/en/Java.Util.Jar/Attributes.xml
index ef90679b8d..4270ffb559 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/Attributes.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/Attributes.xml
@@ -104,12 +104,13 @@
         <Parameter Name="attr" Type="Java.Util.Jar.Attributes" />
       </Parameters>
       <Docs>
-        <param name="attr">To be added.</param>
-        <summary>Constructs a new, empty Attributes object with default size.</summary>
+        <param name="attr">the specified Attributes</param>
+        <summary>Constructs a new Attributes object with the same attribute name-value
+            mappings as in the specified Attributes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/Attributes#Attributes()" title="Reference documentation">Java documentation for <code>java.util.jar.Attributes.Attributes()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/Attributes#Attributes(java.util.jar.Attributes)" title="Reference documentation">Java documentation for <code>java.util.jar.Attributes.Attributes(java.util.jar.Attributes)</code>.</a>
             </format>
           </para>
           <para>
@@ -141,12 +142,13 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
-        <summary>Constructs a new, empty Attributes object with default size.</summary>
+        <param name="size">the initial number of attributes</param>
+        <summary>Constructs a new, empty Attributes object with the specified
+            initial size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/Attributes#Attributes()" title="Reference documentation">Java documentation for <code>java.util.jar.Attributes.Attributes()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/Attributes#Attributes(int)" title="Reference documentation">Java documentation for <code>java.util.jar.Attributes.Attributes(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml b/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml
index b73aeb60a8..9e3a8532f1 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarEntry.xml
@@ -54,14 +54,13 @@
         <Parameter Name="je" Type="Java.Util.Jar.JarEntry" />
       </Parameters>
       <Docs>
-        <param name="je">To be added.</param>
-        <param name="name">the JAR file entry name</param>
-        <summary>Creates a new &lt;code&gt;JarEntry&lt;/code&gt; for the specified JAR file
-            entry name.</summary>
+        <param name="je">the &lt;code&gt;JarEntry&lt;/code&gt; to copy</param>
+        <summary>Creates a new &lt;code&gt;JarEntry&lt;/code&gt; with fields taken from the
+            specified &lt;code&gt;JarEntry&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarEntry#JarEntry(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.jar.JarEntry.JarEntry(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarEntry#JarEntry(java.util.jar.JarEntry)" title="Reference documentation">Java documentation for <code>java.util.jar.JarEntry.JarEntry(java.util.jar.JarEntry)</code>.</a>
             </format>
           </para>
           <para>
@@ -93,14 +92,14 @@
         <Parameter Name="ze" Type="Java.Util.Zip.ZipEntry" />
       </Parameters>
       <Docs>
-        <param name="ze">To be added.</param>
-        <param name="name">the JAR file entry name</param>
-        <summary>Creates a new &lt;code&gt;JarEntry&lt;/code&gt; for the specified JAR file
-            entry name.</summary>
+        <param name="ze">the &lt;code&gt;ZipEntry&lt;/code&gt; object to create the
+                      &lt;code&gt;JarEntry&lt;/code&gt; from</param>
+        <summary>Creates a new &lt;code&gt;JarEntry&lt;/code&gt; with fields taken from the
+            specified &lt;code&gt;ZipEntry&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarEntry#JarEntry(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.jar.JarEntry.JarEntry(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarEntry#JarEntry(java.util.zip.ZipEntry)" title="Reference documentation">Java documentation for <code>java.util.jar.JarEntry.JarEntry(java.util.zip.ZipEntry)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarException.xml b/docs/Mono.Android/en/Java.Util.Jar/JarException.xml
index b949ae2620..f1066b8112 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarException.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarException.xml
@@ -88,12 +88,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a JarException with no detail message.</summary>
+        <param name="s">the detail message</param>
+        <summary>Constructs a JarException with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarException#JarException()" title="Reference documentation">Java documentation for <code>java.util.jar.JarException.JarException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarException#JarException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.jar.JarException.JarException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml b/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml
index a1544f2cd9..c4d8aa41e6 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarFile.xml
@@ -95,14 +95,13 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="file">the jar file to be opened for reading</param>
+        <param name="name">the name of the jar file to be opened for reading</param>
         <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object.</summary>
+            file &lt;code&gt;name&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -137,14 +136,15 @@
         <Parameter Name="verify" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="verify">To be added.</param>
         <param name="file">the jar file to be opened for reading</param>
+        <param name="verify">whether or not to verify the jar file if
+            it is signed.</param>
         <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
             &lt;code&gt;File&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.io.File,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.io.File, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,15 +202,15 @@
         <Parameter Name="verify" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="verify">To be added.</param>
-        <param name="file">the jar file to be opened for reading</param>
+        <param name="name">the name of the jar file to be opened for reading</param>
+        <param name="verify">whether or not to verify the jar file if
+            it is signed.</param>
         <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object.</summary>
+            file &lt;code&gt;name&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -246,15 +246,16 @@
         <Parameter Name="mode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="verify">To be added.</param>
-        <param name="mode">To be added.</param>
         <param name="file">the jar file to be opened for reading</param>
+        <param name="verify">whether or not to verify the jar file if
+            it is signed.</param>
+        <param name="mode">the mode in which the file is to be opened</param>
         <summary>Creates a new &lt;code&gt;JarFile&lt;/code&gt; to read from the specified
-            &lt;code&gt;File&lt;/code&gt; object.</summary>
+            &lt;code&gt;File&lt;/code&gt; object in the specified mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarFile#JarFile(java.io.File,%20boolean,%20int)" title="Reference documentation">Java documentation for <code>java.util.jar.JarFile.JarFile(java.io.File, boolean, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml b/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml
index 33c881fb42..1ab766d12e 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarInputStream.xml
@@ -119,14 +119,15 @@
         <Parameter Name="verify" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="verify">To be added.</param>
         <param name="in">the actual input stream</param>
+        <param name="verify">whether or not to verify the JarInputStream if
+            it is signed.</param>
         <summary>Creates a new &lt;code&gt;JarInputStream&lt;/code&gt; and reads the optional
             manifest.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarInputStream#JarInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.jar.JarInputStream.JarInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarInputStream#JarInputStream(java.io.InputStream,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.jar.JarInputStream.JarInputStream(java.io.InputStream, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml b/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml
index 9e3012cb14..8105f91583 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/JarOutputStream.xml
@@ -118,13 +118,14 @@
         <Parameter Name="man" Type="Java.Util.Jar.Manifest" />
       </Parameters>
       <Docs>
-        <param name="man">To be added.</param>
         <param name="out">the actual output stream</param>
-        <summary>Creates a new &lt;code&gt;JarOutputStream&lt;/code&gt; with no manifest.</summary>
+        <param name="man">the optional &lt;code&gt;Manifest&lt;/code&gt;</param>
+        <summary>Creates a new &lt;code&gt;JarOutputStream&lt;/code&gt; with the specified
+            &lt;code&gt;Manifest&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/JarOutputStream#JarOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.jar.JarOutputStream.JarOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/JarOutputStream#JarOutputStream(java.io.OutputStream,%20java.util.jar.Manifest)" title="Reference documentation">Java documentation for <code>java.util.jar.JarOutputStream.JarOutputStream(java.io.OutputStream, java.util.jar.Manifest)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Jar/Manifest.xml b/docs/Mono.Android/en/Java.Util.Jar/Manifest.xml
index ad2eab9bdd..58e8d33218 100644
--- a/docs/Mono.Android/en/Java.Util.Jar/Manifest.xml
+++ b/docs/Mono.Android/en/Java.Util.Jar/Manifest.xml
@@ -101,12 +101,12 @@
         <Parameter Name="man" Type="Java.Util.Jar.Manifest" />
       </Parameters>
       <Docs>
-        <param name="man">To be added.</param>
-        <summary>Constructs a new, empty Manifest.</summary>
+        <param name="man">the Manifest to copy</param>
+        <summary>Constructs a new Manifest that is a copy of the specified Manifest.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/Manifest#Manifest()" title="Reference documentation">Java documentation for <code>java.util.jar.Manifest.Manifest()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/Manifest#Manifest(java.util.jar.Manifest)" title="Reference documentation">Java documentation for <code>java.util.jar.Manifest.Manifest(java.util.jar.Manifest)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,12 +138,12 @@
         <Parameter Name="is" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="is">To be added.</param>
-        <summary>Constructs a new, empty Manifest.</summary>
+        <param name="is">the input stream containing manifest data</param>
+        <summary>Constructs a new Manifest from the specified input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/jar/Manifest#Manifest()" title="Reference documentation">Java documentation for <code>java.util.jar.Manifest.Manifest()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/jar/Manifest#Manifest(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.jar.Manifest.Manifest(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Logging/FileHandler.xml b/docs/Mono.Android/en/Java.Util.Logging/FileHandler.xml
index 699f2fee1e..60389d83db 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/FileHandler.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/FileHandler.xml
@@ -89,12 +89,12 @@
         <Parameter Name="pattern" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <summary>Construct a default <c>FileHandler</c>.</summary>
+        <param name="pattern">the name of the output file</param>
+        <summary>Initialize a <c>FileHandler</c> to write to the given filename.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler()" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -154,13 +154,14 @@
         <Parameter Name="append" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <param name="append">To be added.</param>
-        <summary>Construct a default <c>FileHandler</c>.</summary>
+        <param name="pattern">the name of the output file</param>
+        <param name="append">specifies append mode</param>
+        <summary>Initialize a <c>FileHandler</c> to write to the given filename,
+            with optional append.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler()" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -198,14 +199,14 @@
         <Parameter Name="count" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <param name="limit">To be added.</param>
-        <param name="count">To be added.</param>
-        <summary>Construct a default <c>FileHandler</c>.</summary>
+        <param name="pattern">the pattern for naming the output file</param>
+        <param name="limit">the maximum number of bytes to write to any one file</param>
+        <param name="count">the number of files to use</param>
+        <summary>Initialize a <c>FileHandler</c> to write to a set of files.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler()" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler(java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler(java.lang.String, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -245,15 +246,16 @@
         <Parameter Name="append" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="pattern">To be added.</param>
-        <param name="limit">To be added.</param>
-        <param name="count">To be added.</param>
-        <param name="append">To be added.</param>
-        <summary>Construct a default <c>FileHandler</c>.</summary>
+        <param name="pattern">the pattern for naming the output file</param>
+        <param name="limit">the maximum number of bytes to write to any one file</param>
+        <param name="count">the number of files to use</param>
+        <param name="append">specifies append mode</param>
+        <summary>Initialize a <c>FileHandler</c> to write to a set of files
+            with optional append.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler()" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/FileHandler#FileHandler(java.lang.String,%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.logging.FileHandler.FileHandler(java.lang.String, int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Logging/Level.xml b/docs/Mono.Android/en/Java.Util.Logging/Level.xml
index d02d801c7d..951942250f 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/Level.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/Level.xml
@@ -134,14 +134,17 @@
         <Parameter Name="resourceBundleName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="resourceBundleName">To be added.</param>
         <param name="name">the name of the Level, for example "SEVERE".</param>
         <param name="value">an integer value for the level.</param>
-        <summary>Create a named Level with a given integer value.</summary>
+        <param name="resourceBundleName">name of a resource bundle to use in
+               localizing the given name. If the resourceBundleName is null
+               or an empty string, it is ignored.</param>
+        <summary>Create a named Level with a given integer value and a
+            given localization resource name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Level#Level(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.util.logging.Level.Level(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Level#Level(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Level.Level(java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Logging/LogManager.xml b/docs/Mono.Android/en/Java.Util.Logging/LogManager.xml
index 84cf20bf05..d4feee2fa4 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/LogManager.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/LogManager.xml
@@ -540,12 +540,13 @@
         <Parameter Name="ins" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="ins">the input stream</param>
-        <summary>Reinitialize the logging properties and reread the logging configuration.</summary>
+        <param name="ins">stream to read properties from</param>
+        <summary>Reinitialize the logging properties and reread the logging configuration
+            from the given stream, which should be in java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/LogManager#readConfiguration()" title="Reference documentation">Java documentation for <code>java.util.logging.LogManager.readConfiguration()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/LogManager#readConfiguration(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.logging.LogManager.readConfiguration(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Logging/Logger.xml b/docs/Mono.Android/en/Java.Util.Logging/Logger.xml
index b42ef4a0a1..696e62680d 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/Logger.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/Logger.xml
@@ -201,13 +201,14 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a CONFIG message.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a CONFIG message, which is only to be constructed if the logging
+            level is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#config(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.config(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#config(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.config(java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -325,9 +326,9 @@
         <Parameter Name="param1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="param1">To be added.</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that is being entered</param>
+        <param name="param1">To be added.</param>
         <summary>Log a method entry.</summary>
         <remarks>
           <para>
@@ -369,10 +370,10 @@
         <Parameter Name="params" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="params">an array of parameters for the method call.
-</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that is being entered</param>
+        <param name="params">an array of parameters for the method call.
+</param>
         <summary>Log a method entry.</summary>
         <remarks>
           <para>
@@ -456,10 +457,10 @@
         <Parameter Name="result" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="result">the return value of the method call.
-</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of the method</param>
+        <param name="result">the return value of the method call.
+</param>
         <summary>Log a method return.</summary>
         <remarks>
           <para>
@@ -548,13 +549,14 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a FINE message.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a FINE message, which is only to be constructed if the logging
+            level is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#fine(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.fine(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#fine(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.fine(java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -628,13 +630,14 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a FINER message.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a FINER message, which is only to be constructed if the logging
+            level is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#finer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.finer(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#finer(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.finer(java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -708,13 +711,14 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a FINEST message.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a FINEST message, which is only to be constructed if the logging
+            level is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#finest(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.finest(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#finest(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.finest(java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -788,13 +792,15 @@
         <Parameter Name="resourceBundleName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="resourceBundleName">the name of the resource bundle used to localize log messages.</param>
+        <param name="resourceBundleName">name of ResourceBundle to be used for localizing
+                                     messages for this logger.
+                     May be null if none of the messages require localization.</param>
         <summary>Create an anonymous Logger.</summary>
         <returns>a newly created private Logger</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#getAnonymousLogger()" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.getAnonymousLogger()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#getAnonymousLogger(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.getAnonymousLogger(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -917,18 +923,20 @@
         <Parameter Name="resourceBundleName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="resourceBundleName">the name of the resource bundle, may be <c>null</c>.</param>
         <param name="name">A name for the logger.  This should
                                      be a dot-separated name and should normally
                                      be based on the package name or class name
                                      of the subsystem, such as java.net
                                      or javax.swing</param>
+        <param name="resourceBundleName">name of ResourceBundle to be used for localizing
+                                     messages for this logger. May be <c>null</c>
+                                     if none of the messages require localization.</param>
         <summary>Find or create a logger for a named subsystem.</summary>
         <returns>a suitable Logger</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#getLogger(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.getLogger(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#getLogger(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.getLogger(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1038,13 +1046,14 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log an INFO message.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a INFO message, which is only to be constructed if the logging
+            level is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#info(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.info(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#info(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.info(java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -1241,15 +1250,12 @@
         <Parameter Name="record" Type="Java.Util.Logging.LogRecord" />
       </Parameters>
       <Docs>
-        <param name="record">the log record to be logged.
-</param>
-        <param name="level">One of the message level identifiers, e.g., SEVERE</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, with no arguments.</summary>
+        <param name="record">the LogRecord to be published</param>
+        <summary>Log a LogRecord.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.LogRecord)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.LogRecord)</code>.</a>
             </format>
           </para>
           <para>
@@ -1285,14 +1291,15 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, with no arguments.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a message, which is only to be constructed if the logging level
+            is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -1370,15 +1377,15 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="thrown">To be added.</param>
-        <param name="msgSupplier">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, with no arguments.</summary>
+        <param name="thrown">Throwable associated with log message.</param>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a lazily constructed message, with associated Throwable information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.Throwable,%20java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.Throwable, java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -1414,14 +1421,14 @@
         <Parameter Name="param1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="param1">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, with no arguments.</summary>
+        <param name="param1">parameter to the message</param>
+        <summary>Log a message, with one object parameter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1458,15 +1465,14 @@
         <Parameter Name="params" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="params">the parameter array associated with the event that is logged.
-</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, with no arguments.</summary>
+        <param name="params">array of parameters to the message</param>
+        <summary>Log a message, with an array of object arguments.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1503,16 +1509,14 @@
         <Parameter Name="thrown" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="thrown">the <c>Throwable</c> object associated with the event that is
-            logged.
-</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, with no arguments.</summary>
+        <param name="thrown">Throwable associated with log message.</param>
+        <summary>Log a message, with associated Throwable information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#log(java.util.logging.Level,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.log(java.util.logging.Level, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1550,17 +1554,17 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, specifying source class and method,
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a lazily constructed message, specifying source class and method,
             with no arguments.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -1645,18 +1649,18 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="thrown">To be added.</param>
-        <param name="msgSupplier">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, specifying source class and method,
-            with no arguments.</summary>
+        <param name="thrown">Throwable associated with log message.</param>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a lazily constructed message, specifying source class and method,
+            with associated Throwable information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.Throwable,%20java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.Throwable, java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -1694,17 +1698,17 @@
         <Parameter Name="param1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="param1">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
+        <param name="param1">Parameter to the log message.</param>
         <summary>Log a message, specifying source class and method,
-            with no arguments.</summary>
+            with a single object parameter to the log message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1743,18 +1747,17 @@
         <Parameter Name="params" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="params">the parameter array associated with the event that is logged.
-</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
+        <param name="params">Array of parameters to the message</param>
         <summary>Log a message, specifying source class and method,
-            with no arguments.</summary>
+            with an array of object arguments.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1793,18 +1796,17 @@
         <Parameter Name="thrown" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="thrown">the <c>Throwable</c> object.
-</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
+        <param name="thrown">Throwable associated with log message.</param>
         <summary>Log a message, specifying source class and method,
-            with no arguments.</summary>
+            with associated Throwable information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logp(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -1905,14 +1907,12 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="bundle">To be added.</param>
-        <param name="params">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
-        <param name="bundleName">name of resource bundle to localize msg,
-                                    can be null</param>
+        <param name="bundle">To be added.</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
+        <param name="params">To be added.</param>
         <summary>Log a message, specifying source class, method, and resource bundle name
             with no arguments.</summary>
         <remarks>
@@ -1957,20 +1957,19 @@
         <Parameter Name="thrown" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="bundle">To be added.</param>
-        <param name="thrown">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
-        <param name="sourceClass">name of class that issued the logging request</param>
-        <param name="sourceMethod">name of method that issued the logging request</param>
-        <param name="bundleName">name of resource bundle to localize msg,
-                                    can be null</param>
+        <param name="sourceClass">Name of the class that issued the logging request</param>
+        <param name="sourceMethod">Name of the method that issued the logging request</param>
+        <param name="bundle">Resource bundle to localize <c>msg</c>,
+                                    can be <c>null</c></param>
         <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, specifying source class, method, and resource bundle name
-            with no arguments.</summary>
+        <param name="thrown">Throwable associated with the log message.</param>
+        <summary>Log a message, specifying source class, method, and resource bundle,
+            with associated Throwable information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.util.ResourceBundle,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.util.ResourceBundle, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -2013,19 +2012,19 @@
         <Parameter Name="param1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="param1">To be added.</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
         <param name="bundleName">name of resource bundle to localize msg,
                                     can be null</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, specifying source class, method, and resource bundle name
-            with no arguments.</summary>
+        <param name="param1">Parameter to the log message.</param>
+        <summary>Log a message, specifying source class, method, and resource bundle name,
+            with a single object parameter to the log message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -2069,20 +2068,19 @@
         <Parameter Name="params" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="params">the parameter array associated with the event that is logged.
-</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
         <param name="bundleName">name of resource bundle to localize msg,
-                                    can be null</param>
+                                    can be null.</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, specifying source class, method, and resource bundle name
-            with no arguments.</summary>
+        <param name="params">Array of parameters to the message</param>
+        <summary>Log a message, specifying source class, method, and resource bundle name,
+            with an array of object arguments.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2126,20 +2124,19 @@
         <Parameter Name="thrown" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="thrown">the <c>Throwable</c> object.
-</param>
         <param name="level">One of the message level identifiers, e.g., SEVERE</param>
         <param name="sourceClass">name of class that issued the logging request</param>
         <param name="sourceMethod">name of method that issued the logging request</param>
         <param name="bundleName">name of resource bundle to localize msg,
                                     can be null</param>
         <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a message, specifying source class, method, and resource bundle name
-            with no arguments.</summary>
+        <param name="thrown">Throwable associated with log message.</param>
+        <summary>Log a message, specifying source class, method, and resource bundle name,
+            with associated Throwable information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#logrb(java.util.logging.Level,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -2388,13 +2385,14 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a SEVERE message.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a SEVERE message, which is only to be constructed if the logging
+            level is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#severe(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.severe(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#severe(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.severe(java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -2626,13 +2624,14 @@
         <Parameter Name="msgSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="msgSupplier">To be added.</param>
-        <param name="msg">The string message (or a key in the message catalog)</param>
-        <summary>Log a WARNING message.</summary>
+        <param name="msgSupplier">A function, which when called, produces the
+                                   desired log message</param>
+        <summary>Log a WARNING message, which is only to be constructed if the logging
+            level is such that the message will actually be logged.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/Logger#warning(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.warning(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/Logger#warning(java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.logging.Logger.warning(java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Logging/MemoryHandler.xml b/docs/Mono.Android/en/Java.Util.Logging/MemoryHandler.xml
index fd1e6578b8..75410b01d9 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/MemoryHandler.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/MemoryHandler.xml
@@ -117,15 +117,14 @@
         <Parameter Name="pushLevel" Type="Java.Util.Logging.Level" />
       </Parameters>
       <Docs>
-        <param name="target">To be added.</param>
-        <param name="size">To be added.</param>
-        <param name="pushLevel">To be added.</param>
-        <summary>Create a <c>MemoryHandler</c> and configure it based on
-            <c>LogManager</c> configuration properties.</summary>
+        <param name="target">the Handler to which to publish output.</param>
+        <param name="size">the number of log records to buffer (must be greater than zero)</param>
+        <param name="pushLevel">message level to push on</param>
+        <summary>Create a <c>MemoryHandler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/MemoryHandler#MemoryHandler()" title="Reference documentation">Java documentation for <code>java.util.logging.MemoryHandler.MemoryHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/MemoryHandler#MemoryHandler(java.util.logging.Handler,%20int,%20java.util.logging.Level)" title="Reference documentation">Java documentation for <code>java.util.logging.MemoryHandler.MemoryHandler(java.util.logging.Handler, int, java.util.logging.Level)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Logging/SocketHandler.xml b/docs/Mono.Android/en/Java.Util.Logging/SocketHandler.xml
index 2d5fca6540..d03ae50c81 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/SocketHandler.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/SocketHandler.xml
@@ -115,14 +115,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <summary>Create a <c>SocketHandler</c>, using only <c>LogManager</c> properties
-            (or their defaults).</summary>
+        <param name="host">target host.</param>
+        <param name="port">target port.</param>
+        <summary>Construct a <c>SocketHandler</c> using a specified host and port.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/SocketHandler#SocketHandler()" title="Reference documentation">Java documentation for <code>java.util.logging.SocketHandler.SocketHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/SocketHandler#SocketHandler(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.util.logging.SocketHandler.SocketHandler(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Logging/StreamHandler.xml b/docs/Mono.Android/en/Java.Util.Logging/StreamHandler.xml
index 17ade3e075..96ccc23218 100644
--- a/docs/Mono.Android/en/Java.Util.Logging/StreamHandler.xml
+++ b/docs/Mono.Android/en/Java.Util.Logging/StreamHandler.xml
@@ -111,13 +111,14 @@
         <Parameter Name="formatter" Type="Java.Util.Logging.Formatter" />
       </Parameters>
       <Docs>
-        <param name="out">To be added.</param>
-        <param name="formatter">To be added.</param>
-        <summary>Create a <c>StreamHandler</c>, with no current output stream.</summary>
+        <param name="out">the target output stream</param>
+        <param name="formatter">Formatter to be used to format output</param>
+        <summary>Create a <c>StreamHandler</c> with a given <c>Formatter</c>
+            and output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/logging/StreamHandler#StreamHandler()" title="Reference documentation">Java documentation for <code>java.util.logging.StreamHandler.StreamHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/logging/StreamHandler#StreamHandler(java.io.OutputStream,%20java.util.logging.Formatter)" title="Reference documentation">Java documentation for <code>java.util.logging.StreamHandler.StreamHandler(java.io.OutputStream, java.util.logging.Formatter)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Prefs/BackingStoreException.xml b/docs/Mono.Android/en/Java.Util.Prefs/BackingStoreException.xml
index 4330ae8c95..c0af20ed45 100644
--- a/docs/Mono.Android/en/Java.Util.Prefs/BackingStoreException.xml
+++ b/docs/Mono.Android/en/Java.Util.Prefs/BackingStoreException.xml
@@ -56,13 +56,12 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="s">the detail message.</param>
-        <summary>Constructs a BackingStoreException with the specified detail message.</summary>
+        <param name="cause">the cause</param>
+        <summary>Constructs a BackingStoreException with the specified cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/prefs/BackingStoreException#BackingStoreException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.prefs.BackingStoreException.BackingStoreException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/prefs/BackingStoreException#BackingStoreException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.prefs.BackingStoreException.BackingStoreException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Prefs/InvalidPreferencesFormatException.xml b/docs/Mono.Android/en/Java.Util.Prefs/InvalidPreferencesFormatException.xml
index ab3bd1a87d..9fe1d4ec59 100644
--- a/docs/Mono.Android/en/Java.Util.Prefs/InvalidPreferencesFormatException.xml
+++ b/docs/Mono.Android/en/Java.Util.Prefs/InvalidPreferencesFormatException.xml
@@ -57,15 +57,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">the detail message. The detail message is saved for
-                     later retrieval by the <c>Throwable#getMessage()</c> method.</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).</param>
         <summary>Constructs an InvalidPreferencesFormatException with the specified
-            detail message.</summary>
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/prefs/InvalidPreferencesFormatException#InvalidPreferencesFormatException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.prefs.InvalidPreferencesFormatException.InvalidPreferencesFormatException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/prefs/InvalidPreferencesFormatException#InvalidPreferencesFormatException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.prefs.InvalidPreferencesFormatException.InvalidPreferencesFormatException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -160,15 +159,16 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="message">the detail message. The detail message is saved for
-                     later retrieval by the <c>Throwable#getMessage()</c> method.</param>
+                    later retrieval by the <c>Throwable#getMessage()</c> method.</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).</param>
         <summary>Constructs an InvalidPreferencesFormatException with the specified
-            detail message.</summary>
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/prefs/InvalidPreferencesFormatException#InvalidPreferencesFormatException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.prefs.InvalidPreferencesFormatException.InvalidPreferencesFormatException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/prefs/InvalidPreferencesFormatException#InvalidPreferencesFormatException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.prefs.InvalidPreferencesFormatException.InvalidPreferencesFormatException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Regex/IMatchResult.xml b/docs/Mono.Android/en/Java.Util.Regex/IMatchResult.xml
index e0ea4688ca..75da838a2b 100644
--- a/docs/Mono.Android/en/Java.Util.Regex/IMatchResult.xml
+++ b/docs/Mono.Android/en/Java.Util.Regex/IMatchResult.xml
@@ -102,14 +102,16 @@
         <Parameter Name="group" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="group">the group, ranging from 0 to groupCount() - 1, with 0
-            representing the whole pattern.</param>
-        <summary>Returns the offset after the last character matched.</summary>
-        <returns>The offset after the last character matched</returns>
+        <param name="group">The index of a capturing group in this matcher's pattern</param>
+        <summary>Returns the offset after the last character of the subsequence
+            captured by the given group during this match.</summary>
+        <returns>The offset after the last character captured by the group,
+                     or <c>-1</c> if the match was successful
+                     but the group itself did not match anything</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/MatchResult#end()" title="Reference documentation">Java documentation for <code>java.util.regex.MatchResult.end()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/MatchResult#end(int)" title="Reference documentation">Java documentation for <code>java.util.regex.MatchResult.end(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -183,15 +185,16 @@
         <Parameter Name="group" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="group">the group, ranging from 0 to groupCount() - 1, with 0
-            representing the whole pattern.</param>
-        <summary>Returns the input subsequence matched by the previous match.</summary>
-        <returns>The (possibly empty) subsequence matched by the previous match,
-                    in string form</returns>
+        <param name="group">The index of a capturing group in this matcher's pattern</param>
+        <summary>Returns the input subsequence captured by the given group during the
+            previous match operation.</summary>
+        <returns>The (possibly empty) subsequence captured by the group
+                     during the previous match, or <c>null</c> if the group
+                     failed to match part of the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/MatchResult#group()" title="Reference documentation">Java documentation for <code>java.util.regex.MatchResult.group()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/MatchResult#group(int)" title="Reference documentation">Java documentation for <code>java.util.regex.MatchResult.group(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -302,14 +305,16 @@
         <Parameter Name="group" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="group">the group, ranging from 0 to groupCount() - 1, with 0
-            representing the whole pattern.</param>
-        <summary>Returns the start index of the match.</summary>
-        <returns>The index of the first character matched</returns>
+        <param name="group">The index of a capturing group in this matcher's pattern</param>
+        <summary>Returns the start index of the subsequence captured by the given group
+            during this match.</summary>
+        <returns>The index of the first character captured by the group,
+                     or <c>-1</c> if the match was successful but the group
+                     itself did not match anything</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/MatchResult#start()" title="Reference documentation">Java documentation for <code>java.util.regex.MatchResult.start()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/MatchResult#start(int)" title="Reference documentation">Java documentation for <code>java.util.regex.MatchResult.start(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml b/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml
index 0f17c3d6bd..a6b3186c0f 100644
--- a/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml
+++ b/docs/Mono.Android/en/Java.Util.Regex/Matcher.xml
@@ -196,14 +196,16 @@
         <Parameter Name="group" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="group">the group, ranging from 0 to groupCount() - 1, with 0
-            representing the whole pattern.</param>
-        <summary>Returns the offset after the last character matched.</summary>
-        <returns>The offset after the last character matched</returns>
+        <param name="group">The index of a capturing group in this matcher's pattern</param>
+        <summary>Returns the offset after the last character of the subsequence
+            captured by the given group during the previous match operation.</summary>
+        <returns>The offset after the last character captured by the group,
+                     or <c>-1</c> if the match was successful
+                     but the group itself did not match anything</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#end()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.end()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#end(int)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.end(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -240,13 +242,16 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Returns the offset after the last character matched.</summary>
-        <returns>The offset after the last character matched</returns>
+        <param name="name">The name of a named-capturing group in this matcher's pattern</param>
+        <summary>Returns the offset after the last character of the subsequence
+            captured by the given &lt;a href="Pattern.</summary>
+        <returns>The offset after the last character captured by the group,
+                     or <c>-1</c> if the match was successful
+                     but the group itself did not match anything</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#end()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.end()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#end(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.end(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -321,16 +326,18 @@
         <Parameter Name="start" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="start">To be added.</param>
-        <summary>Attempts to find the next subsequence of the input sequence that matches
-            the pattern.</summary>
+        <param name="start">the index to start searching for a match</param>
+        <summary>Resets this matcher and then attempts to find the next subsequence of
+            the input sequence that matches the pattern, starting at the specified
+            index.</summary>
         <returns>
           <c>true</c> if, and only if, a subsequence of the input
-                     sequence matches this matcher's pattern</returns>
+                     sequence starting at the given index matches this matcher's
+                     pattern</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#find()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.find()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#find(int)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.find(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -413,15 +420,16 @@
         <Parameter Name="group" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="group">the group, ranging from 0 to groupCount() - 1, with 0
-            representing the whole pattern.</param>
-        <summary>Returns the input subsequence matched by the previous match.</summary>
-        <returns>The (possibly empty) subsequence matched by the previous match,
-                    in string form</returns>
+        <param name="group">The index of a capturing group in this matcher's pattern</param>
+        <summary>Returns the input subsequence captured by the given group during the
+            previous match operation.</summary>
+        <returns>The (possibly empty) subsequence captured by the group
+                     during the previous match, or <c>null</c> if the group
+                     failed to match part of the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#group()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.group()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#group(int)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.group(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -458,14 +466,16 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Returns the input subsequence matched by the previous match.</summary>
-        <returns>The (possibly empty) subsequence matched by the previous match,
-                    in string form</returns>
+        <param name="name">The name of a named-capturing group in this matcher's pattern</param>
+        <summary>Returns the input subsequence captured by the given
+            &lt;a href="Pattern.</summary>
+        <returns>The (possibly empty) subsequence captured by the named group
+                     during the previous match, or <c>null</c> if the group
+                     failed to match part of the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#group()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.group()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#group(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.group(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1138,13 +1148,13 @@
         <Parameter Name="input" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="input">the new input sequence.</param>
-        <summary>Resets this matcher.</summary>
+        <param name="input">The new input character sequence</param>
+        <summary>Resets this matcher with a new input sequence.</summary>
         <returns>This matcher</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#reset()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.reset()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#reset(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.reset(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1173,13 +1183,13 @@
         <Parameter Name="input" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="input">To be added.</param>
-        <summary>Resets this matcher.</summary>
+        <param name="input">The new input character sequence</param>
+        <summary>Resets this matcher with a new input sequence.</summary>
         <returns>This matcher</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#reset()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.reset()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#reset(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.reset(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1259,14 +1269,16 @@
         <Parameter Name="group" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="group">the group, ranging from 0 to groupCount() - 1, with 0
-            representing the whole pattern.</param>
-        <summary>Returns the start index of the previous match.</summary>
-        <returns>The index of the first character matched</returns>
+        <param name="group">The index of a capturing group in this matcher's pattern</param>
+        <summary>Returns the start index of the subsequence captured by the given group
+            during the previous match operation.</summary>
+        <returns>The index of the first character captured by the group,
+                     or <c>-1</c> if the match was successful but the group
+                     itself did not match anything</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#start()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.start()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#start(int)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.start(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1303,13 +1315,16 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Returns the start index of the previous match.</summary>
-        <returns>The index of the first character matched</returns>
+        <param name="name">The name of a named-capturing group in this matcher's pattern</param>
+        <summary>Returns the start index of the subsequence captured by the given
+            &lt;a href="Pattern.</summary>
+        <returns>The index of the first character captured by the group,
+                     or <c>-1</c> if the match was successful but the group
+                     itself did not match anything</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Matcher#start()" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.start()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Matcher#start(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.regex.Matcher.start(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml b/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml
index ed811b582f..287b1a77de 100644
--- a/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml
+++ b/docs/Mono.Android/en/Java.Util.Regex/Pattern.xml
@@ -275,14 +275,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="flags">To be added.</param>
         <param name="regex">The expression to be compiled</param>
-        <summary>Compiles the given regular expression into a pattern.</summary>
-        <returns>the given regular expression compiled into a pattern</returns>
+        <param name="flags">Match flags, a bit mask that may include
+                    <c>#CASE_INSENSITIVE</c>, <c>#MULTILINE</c>, <c>#DOTALL</c>,
+                    <c>#UNICODE_CASE</c>, <c>#UNIX_LINES</c>, <c>#LITERAL</c>,
+                    and <c>#COMMENTS</c></param>
+        <summary>Compiles the given regular expression into a pattern with the given
+            flags.</summary>
+        <returns>the given regular expression compiled into a pattern with the given flags</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/regex/Pattern#compile(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.regex.Pattern.compile(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/regex/Pattern#compile(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.util.regex.Pattern.compile(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Streams/Collector.xml b/docs/Mono.Android/en/Java.Util.Streams/Collector.xml
index f8921eb7f0..59e131db9d 100644
--- a/docs/Mono.Android/en/Java.Util.Streams/Collector.xml
+++ b/docs/Mono.Android/en/Java.Util.Streams/Collector.xml
@@ -77,12 +77,8 @@
         <param name="supplier">The supplier function for the new collector</param>
         <param name="accumulator">The accumulator function for the new collector</param>
         <param name="combiner">The combiner function for the new collector</param>
-        <param name="finisher">The finisher function for the new collector</param>
         <param name="characteristics">The collector characteristics for the new
                                    collector</param>
-        <param name="&lt;T&gt;&lt;T&gt;">The type of input elements for the new collector</param>
-        <param name="&lt;A&gt;&lt;A&gt;">The intermediate accumulation type of the new collector</param>
-        <param name="&lt;R&gt;&lt;R&gt;">The final result type of the new collector</param>
         <summary>Returns a new <c>Collector</c> described by the given <c>supplier</c>,
             <c>accumulator</c>, <c>combiner</c>, and <c>finisher</c> functions.</summary>
         <returns>the new <c>Collector</c></returns>
@@ -148,9 +144,6 @@
         <param name="finisher">The finisher function for the new collector</param>
         <param name="characteristics">The collector characteristics for the new
                                    collector</param>
-        <param name="&lt;T&gt;&lt;T&gt;">The type of input elements for the new collector</param>
-        <param name="&lt;A&gt;&lt;A&gt;">The intermediate accumulation type of the new collector</param>
-        <param name="&lt;R&gt;&lt;R&gt;">The final result type of the new collector</param>
         <summary>Returns a new <c>Collector</c> described by the given <c>supplier</c>,
             <c>accumulator</c>, <c>combiner</c>, and <c>finisher</c> functions.</summary>
         <returns>the new <c>Collector</c></returns>
diff --git a/docs/Mono.Android/en/Java.Util.Streams/Collectors.xml b/docs/Mono.Android/en/Java.Util.Streams/Collectors.xml
index 1ce7f9c8b7..46109057d4 100644
--- a/docs/Mono.Android/en/Java.Util.Streams/Collectors.xml
+++ b/docs/Mono.Android/en/Java.Util.Streams/Collectors.xml
@@ -344,18 +344,22 @@
         <Parameter Name="downstream" Type="Java.Util.Streams.ICollector" />
       </Parameters>
       <Docs>
-        <param name="downstream">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the type of the keys</param>
-        <param name="classifier">the classifier function mapping input elements to keys</param>
-        <summary>Returns a <c>Collector</c> implementing a "group by" operation on
-            input elements of type <c>T</c>, grouping elements according to a
-            classification function, and returning the results in a <c>Map</c>.</summary>
-        <returns>a <c>Collector</c> implementing the group-by operation</returns>
+        <param name="&lt;A&gt;&lt;A&gt;">the intermediate accumulation type of the downstream collector</param>
+        <param name="&lt;D&gt;&lt;D&gt;">the result type of the downstream reduction</param>
+        <param name="classifier">a classifier function mapping input elements to keys</param>
+        <param name="downstream">a <c>Collector</c> implementing the downstream reduction</param>
+        <summary>Returns a <c>Collector</c> implementing a cascaded "group by" operation
+            on input elements of type <c>T</c>, grouping elements according to a
+            classification function, and then performing a reduction operation on
+            the values associated with a given key using the specified downstream
+            <c>Collector</c>.</summary>
+        <returns>a <c>Collector</c> implementing the cascaded group-by operation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingBy(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingBy(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingBy(java.util.function.Function,%20java.util.stream.Collector)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingBy(java.util.function.Function, java.util.stream.Collector)</code>.</a>
             </format>
           </para>
           <para>
@@ -395,19 +399,25 @@
         <Parameter Name="downstream" Type="Java.Util.Streams.ICollector" />
       </Parameters>
       <Docs>
-        <param name="mapFactory">To be added.</param>
-        <param name="downstream">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the type of the keys</param>
-        <param name="classifier">the classifier function mapping input elements to keys</param>
-        <summary>Returns a <c>Collector</c> implementing a "group by" operation on
-            input elements of type <c>T</c>, grouping elements according to a
-            classification function, and returning the results in a <c>Map</c>.</summary>
-        <returns>a <c>Collector</c> implementing the group-by operation</returns>
+        <param name="&lt;A&gt;&lt;A&gt;">the intermediate accumulation type of the downstream collector</param>
+        <param name="&lt;D&gt;&lt;D&gt;">the result type of the downstream reduction</param>
+        <param name="&lt;M&gt;&lt;M&gt;">the type of the resulting <c>Map</c></param>
+        <param name="classifier">a classifier function mapping input elements to keys</param>
+        <param name="downstream">a <c>Collector</c> implementing the downstream reduction</param>
+        <param name="mapFactory">a function which, when called, produces a new empty
+                              <c>Map</c> of the desired type</param>
+        <summary>Returns a <c>Collector</c> implementing a cascaded "group by" operation
+            on input elements of type <c>T</c>, grouping elements according to a
+            classification function, and then performing a reduction operation on
+            the values associated with a given key using the specified downstream
+            <c>Collector</c>.</summary>
+        <returns>a <c>Collector</c> implementing the cascaded group-by operation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingBy(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingBy(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingBy(java.util.function.Function,%20java.util.function.Supplier,%20java.util.stream.Collector)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingBy(java.util.function.Function, java.util.function.Supplier, java.util.stream.Collector)</code>.</a>
             </format>
           </para>
           <para>
@@ -494,18 +504,22 @@
         <Parameter Name="downstream" Type="Java.Util.Streams.ICollector" />
       </Parameters>
       <Docs>
-        <param name="downstream">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the type of the keys</param>
+        <param name="&lt;A&gt;&lt;A&gt;">the intermediate accumulation type of the downstream collector</param>
+        <param name="&lt;D&gt;&lt;D&gt;">the result type of the downstream reduction</param>
         <param name="classifier">a classifier function mapping input elements to keys</param>
-        <summary>Returns a concurrent <c>Collector</c> implementing a "group by"
+        <param name="downstream">a <c>Collector</c> implementing the downstream reduction</param>
+        <summary>Returns a concurrent <c>Collector</c> implementing a cascaded "group by"
             operation on input elements of type <c>T</c>, grouping elements
-            according to a classification function.</summary>
-        <returns>a concurrent, unordered <c>Collector</c> implementing the group-by operation</returns>
+            according to a classification function, and then performing a reduction
+            operation on the values associated with a given key using the specified
+            downstream <c>Collector</c>.</summary>
+        <returns>a concurrent, unordered <c>Collector</c> implementing the cascaded group-by operation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingByConcurrent(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingByConcurrent(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingByConcurrent(java.util.function.Function,%20java.util.stream.Collector)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingByConcurrent(java.util.function.Function, java.util.stream.Collector)</code>.</a>
             </format>
           </para>
           <para>
@@ -545,19 +559,25 @@
         <Parameter Name="downstream" Type="Java.Util.Streams.ICollector" />
       </Parameters>
       <Docs>
-        <param name="mapFactory">To be added.</param>
-        <param name="downstream">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the type of the keys</param>
+        <param name="&lt;A&gt;&lt;A&gt;">the intermediate accumulation type of the downstream collector</param>
+        <param name="&lt;D&gt;&lt;D&gt;">the result type of the downstream reduction</param>
+        <param name="&lt;M&gt;&lt;M&gt;">the type of the resulting <c>ConcurrentMap</c></param>
         <param name="classifier">a classifier function mapping input elements to keys</param>
-        <summary>Returns a concurrent <c>Collector</c> implementing a "group by"
+        <param name="downstream">a <c>Collector</c> implementing the downstream reduction</param>
+        <param name="mapFactory">a function which, when called, produces a new empty
+                              <c>ConcurrentMap</c> of the desired type</param>
+        <summary>Returns a concurrent <c>Collector</c> implementing a cascaded "group by"
             operation on input elements of type <c>T</c>, grouping elements
-            according to a classification function.</summary>
-        <returns>a concurrent, unordered <c>Collector</c> implementing the group-by operation</returns>
+            according to a classification function, and then performing a reduction
+            operation on the values associated with a given key using the specified
+            downstream <c>Collector</c>.</summary>
+        <returns>a concurrent, unordered <c>Collector</c> implementing the cascaded group-by operation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingByConcurrent(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingByConcurrent(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#groupingByConcurrent(java.util.function.Function,%20java.util.function.Supplier,%20java.util.stream.Collector)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.groupingByConcurrent(java.util.function.Function, java.util.function.Supplier, java.util.stream.Collector)</code>.</a>
             </format>
           </para>
           <para>
@@ -661,15 +681,15 @@
         <Parameter Name="delimiter" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="delimiter">To be added.</param>
-        <summary>Returns a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order.</summary>
-        <returns>a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order</returns>
+        <param name="delimiter">the delimiter to be used between each element</param>
+        <summary>Returns a <c>Collector</c> that concatenates the input elements,
+            separated by the specified delimiter, in encounter order.</summary>
+        <returns>A <c>Collector</c> which concatenates CharSequence elements,
+            separated by the specified delimiter, in encounter order</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining()" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -697,15 +717,15 @@
         <Parameter Name="delimiter" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="delimiter">To be added.</param>
-        <summary>Returns a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order.</summary>
-        <returns>a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order</returns>
+        <param name="delimiter">the delimiter to be used between each element</param>
+        <summary>Returns a <c>Collector</c> that concatenates the input elements,
+            separated by the specified delimiter, in encounter order.</summary>
+        <returns>A <c>Collector</c> which concatenates CharSequence elements,
+            separated by the specified delimiter, in encounter order</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining()" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining(java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -741,17 +761,20 @@
         <Parameter Name="suffix" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="delimiter">To be added.</param>
-        <param name="prefix">To be added.</param>
-        <param name="suffix">To be added.</param>
-        <summary>Returns a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order.</summary>
-        <returns>a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order</returns>
+        <param name="delimiter">the delimiter to be used between each element</param>
+        <param name="prefix">the sequence of characters to be used at the beginning
+                           of the joined result</param>
+        <param name="suffix">the sequence of characters to be used at the end
+                           of the joined result</param>
+        <summary>Returns a <c>Collector</c> that concatenates the input elements,
+            separated by the specified delimiter, with the specified prefix and
+            suffix, in encounter order.</summary>
+        <returns>A <c>Collector</c> which concatenates CharSequence elements,
+            separated by the specified delimiter, in encounter order</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining()" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining(java.lang.CharSequence,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining(java.lang.CharSequence, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -781,17 +804,20 @@
         <Parameter Name="suffix" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="delimiter">To be added.</param>
-        <param name="prefix">To be added.</param>
-        <param name="suffix">To be added.</param>
-        <summary>Returns a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order.</summary>
-        <returns>a <c>Collector</c> that concatenates the input elements into a
-            <c>String</c>, in encounter order</returns>
+        <param name="delimiter">the delimiter to be used between each element</param>
+        <param name="prefix">the sequence of characters to be used at the beginning
+                           of the joined result</param>
+        <param name="suffix">the sequence of characters to be used at the end
+                           of the joined result</param>
+        <summary>Returns a <c>Collector</c> that concatenates the input elements,
+            separated by the specified delimiter, with the specified prefix and
+            suffix, in encounter order.</summary>
+        <returns>A <c>Collector</c> which concatenates CharSequence elements,
+            separated by the specified delimiter, in encounter order</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining()" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#joining(java.lang.CharSequence,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.joining(java.lang.CharSequence, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
@@ -1022,17 +1048,23 @@
         <Parameter Name="downstream" Type="Java.Util.Streams.ICollector" />
       </Parameters>
       <Docs>
-        <param name="downstream">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
+        <param name="&lt;A&gt;&lt;A&gt;">the intermediate accumulation type of the downstream collector</param>
+        <param name="&lt;D&gt;&lt;D&gt;">the result type of the downstream reduction</param>
         <param name="predicate">a predicate used for classifying input elements</param>
+        <param name="downstream">a <c>Collector</c> implementing the downstream
+                              reduction</param>
         <summary>Returns a <c>Collector</c> which partitions the input elements according
-            to a <c>Predicate</c>, and organizes them into a
-            <c>Map&lt;Boolean, List&lt;T&gt;&gt;</c>.</summary>
-        <returns>a <c>Collector</c> implementing the partitioning operation</returns>
+            to a <c>Predicate</c>, reduces the values in each partition according to
+            another <c>Collector</c>, and organizes them into a
+            <c>Map&lt;Boolean, D&gt;</c> whose values are the result of the downstream
+            reduction.</summary>
+        <returns>a <c>Collector</c> implementing the cascaded partitioning
+                    operation</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#partitioningBy(java.util.function.Predicate)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.partitioningBy(java.util.function.Predicate)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#partitioningBy(java.util.function.Predicate,%20java.util.stream.Collector)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.partitioningBy(java.util.function.Predicate, java.util.stream.Collector)</code>.</a>
             </format>
           </para>
           <para>
@@ -1070,11 +1102,22 @@
         <Parameter Name="op" Type="Java.Util.Functions.IBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="op">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="&lt;T&gt;&lt;T&gt;">element type for the input and output of the reduction</param>
+        <param name="op">a <c>BinaryOperator&lt;T&gt;</c> used to reduce the input elements</param>
+        <summary>Returns a <c>Collector</c> which performs a reduction of its
+            input elements under a specified <c>BinaryOperator</c>.</summary>
+        <returns>a <c>Collector</c> which implements the reduction operation</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#reducing(java.util.function.BinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.reducing(java.util.function.BinaryOperator)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1144,13 +1187,27 @@
         <Parameter Name="op" Type="Java.Util.Functions.IBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="identity">To be added.</param>
-        <param name="mapper">To be added.</param>
-        <param name="op">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
+        <param name="&lt;U&gt;&lt;U&gt;">the type of the mapped values</param>
+        <param name="identity">the identity value for the reduction (also, the value
+                            that is returned when there are no input elements)</param>
+        <param name="mapper">a mapping function to apply to each input value</param>
+        <param name="op">a <c>BinaryOperator&lt;U&gt;</c> used to reduce the mapped values</param>
+        <summary>Returns a <c>Collector</c> which performs a reduction of its
+            input elements under a specified mapping function and
+            <c>BinaryOperator</c>.</summary>
+        <returns>a <c>Collector</c> implementing the map-reduce operation</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#reducing(java.lang.Object,%20java.util.function.Function,%20java.util.function.BinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.reducing(java.lang.Object, java.util.function.Function, java.util.function.BinaryOperator)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
       </Docs>
     </Member>
@@ -1627,23 +1684,26 @@
         <Parameter Name="mergeFunction" Type="Java.Util.Functions.IBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="mergeFunction">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the output type of the key mapping function</param>
         <param name="&lt;U&gt;&lt;U&gt;">the output type of the value mapping function</param>
-        <param name="keyMapper">the mapping function to produce keys</param>
-        <param name="valueMapper">the mapping function to produce values</param>
+        <param name="keyMapper">a mapping function to produce keys</param>
+        <param name="valueMapper">a mapping function to produce values</param>
+        <param name="mergeFunction">a merge function, used to resolve collisions between
+                                 values associated with the same key, as supplied
+                                 to <c>Map#merge(Object, Object, BiFunction)</c></param>
         <summary>Returns a concurrent <c>Collector</c> that accumulates elements into a
             <c>ConcurrentMap</c> whose keys and values are the result of applying
             the provided mapping functions to the input elements.</summary>
         <returns>a concurrent, unordered <c>Collector</c> which collects elements into a
             <c>ConcurrentMap</c> whose keys are the result of applying a key mapping
             function to the input elements, and whose values are the result of
-            applying a value mapping function to the input elements</returns>
+            applying a value mapping function to all input elements equal to the key
+            and combining them using the merge function</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toConcurrentMap(java.util.function.Function,%20java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toConcurrentMap(java.util.function.Function, java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toConcurrentMap(java.util.function.Function,%20java.util.function.Function,%20java.util.function.BinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toConcurrentMap(java.util.function.Function, java.util.function.Function, java.util.function.BinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -1684,24 +1744,29 @@
         <Parameter Name="mapSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="mergeFunction">To be added.</param>
-        <param name="mapSupplier">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the output type of the key mapping function</param>
         <param name="&lt;U&gt;&lt;U&gt;">the output type of the value mapping function</param>
-        <param name="keyMapper">the mapping function to produce keys</param>
-        <param name="valueMapper">the mapping function to produce values</param>
+        <param name="&lt;M&gt;&lt;M&gt;">the type of the resulting <c>ConcurrentMap</c></param>
+        <param name="keyMapper">a mapping function to produce keys</param>
+        <param name="valueMapper">a mapping function to produce values</param>
+        <param name="mergeFunction">a merge function, used to resolve collisions between
+                                 values associated with the same key, as supplied
+                                 to <c>Map#merge(Object, Object, BiFunction)</c></param>
+        <param name="mapSupplier">a function which returns a new, empty <c>Map</c> into
+                               which the results will be inserted</param>
         <summary>Returns a concurrent <c>Collector</c> that accumulates elements into a
             <c>ConcurrentMap</c> whose keys and values are the result of applying
             the provided mapping functions to the input elements.</summary>
         <returns>a concurrent, unordered <c>Collector</c> which collects elements into a
             <c>ConcurrentMap</c> whose keys are the result of applying a key mapping
             function to the input elements, and whose values are the result of
-            applying a value mapping function to the input elements</returns>
+            applying a value mapping function to all input elements equal to the key
+            and combining them using the merge function</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toConcurrentMap(java.util.function.Function,%20java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toConcurrentMap(java.util.function.Function, java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toConcurrentMap(java.util.function.Function,%20java.util.function.Function,%20java.util.function.BinaryOperator,%20java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toConcurrentMap(java.util.function.Function, java.util.function.Function, java.util.function.BinaryOperator, java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -1838,22 +1903,26 @@
         <Parameter Name="mergeFunction" Type="Java.Util.Functions.IBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="mergeFunction">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the output type of the key mapping function</param>
         <param name="&lt;U&gt;&lt;U&gt;">the output type of the value mapping function</param>
         <param name="keyMapper">a mapping function to produce keys</param>
         <param name="valueMapper">a mapping function to produce values</param>
+        <param name="mergeFunction">a merge function, used to resolve collisions between
+                                 values associated with the same key, as supplied
+                                 to <c>Map#merge(Object, Object, BiFunction)</c></param>
         <summary>Returns a <c>Collector</c> that accumulates elements into a
             <c>Map</c> whose keys and values are the result of applying the provided
             mapping functions to the input elements.</summary>
         <returns>a <c>Collector</c> which collects elements into a <c>Map</c>
-            whose keys and values are the result of applying mapping functions to
-            the input elements</returns>
+            whose keys are the result of applying a key mapping function to the input
+            elements, and whose values are the result of applying a value mapping
+            function to all input elements equal to the key and combining them
+            using the merge function</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toMap(java.util.function.Function,%20java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toMap(java.util.function.Function, java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toMap(java.util.function.Function,%20java.util.function.Function,%20java.util.function.BinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toMap(java.util.function.Function, java.util.function.Function, java.util.function.BinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -1894,23 +1963,29 @@
         <Parameter Name="mapSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="mergeFunction">To be added.</param>
-        <param name="mapSupplier">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the input elements</param>
         <param name="&lt;K&gt;&lt;K&gt;">the output type of the key mapping function</param>
         <param name="&lt;U&gt;&lt;U&gt;">the output type of the value mapping function</param>
+        <param name="&lt;M&gt;&lt;M&gt;">the type of the resulting <c>Map</c></param>
         <param name="keyMapper">a mapping function to produce keys</param>
         <param name="valueMapper">a mapping function to produce values</param>
+        <param name="mergeFunction">a merge function, used to resolve collisions between
+                                 values associated with the same key, as supplied
+                                 to <c>Map#merge(Object, Object, BiFunction)</c></param>
+        <param name="mapSupplier">a function which returns a new, empty <c>Map</c> into
+                               which the results will be inserted</param>
         <summary>Returns a <c>Collector</c> that accumulates elements into a
             <c>Map</c> whose keys and values are the result of applying the provided
             mapping functions to the input elements.</summary>
         <returns>a <c>Collector</c> which collects elements into a <c>Map</c>
-            whose keys and values are the result of applying mapping functions to
-            the input elements</returns>
+            whose keys are the result of applying a key mapping function to the input
+            elements, and whose values are the result of applying a value mapping
+            function to all input elements equal to the key and combining them
+            using the merge function</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toMap(java.util.function.Function,%20java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toMap(java.util.function.Function, java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/stream/Collectors#toMap(java.util.function.Function,%20java.util.function.Function,%20java.util.function.BinaryOperator,%20java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.stream.Collectors.toMap(java.util.function.Function, java.util.function.Function, java.util.function.BinaryOperator, java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Streams/ICollector.xml b/docs/Mono.Android/en/Java.Util.Streams/ICollector.xml
index c6d153fde8..88e1ef0ccf 100644
--- a/docs/Mono.Android/en/Java.Util.Streams/ICollector.xml
+++ b/docs/Mono.Android/en/Java.Util.Streams/ICollector.xml
@@ -240,12 +240,8 @@
         <param name="supplier">The supplier function for the new collector</param>
         <param name="accumulator">The accumulator function for the new collector</param>
         <param name="combiner">The combiner function for the new collector</param>
-        <param name="finisher">The finisher function for the new collector</param>
         <param name="characteristics">The collector characteristics for the new
                                    collector</param>
-        <param name="&lt;T&gt;&lt;T&gt;">The type of input elements for the new collector</param>
-        <param name="&lt;A&gt;&lt;A&gt;">The intermediate accumulation type of the new collector</param>
-        <param name="&lt;R&gt;&lt;R&gt;">The final result type of the new collector</param>
         <summary>Returns a new <c>Collector</c> described by the given <c>supplier</c>,
             <c>accumulator</c>, <c>combiner</c>, and <c>finisher</c> functions.</summary>
         <returns>the new <c>Collector</c></returns>
@@ -307,9 +303,6 @@
         <param name="finisher">The finisher function for the new collector</param>
         <param name="characteristics">The collector characteristics for the new
                                    collector</param>
-        <param name="&lt;T&gt;&lt;T&gt;">The type of input elements for the new collector</param>
-        <param name="&lt;A&gt;&lt;A&gt;">The intermediate accumulation type of the new collector</param>
-        <param name="&lt;R&gt;&lt;R&gt;">The final result type of the new collector</param>
         <summary>Returns a new <c>Collector</c> described by the given <c>supplier</c>,
             <c>accumulator</c>, <c>combiner</c>, and <c>finisher</c> functions.</summary>
         <returns>the new <c>Collector</c></returns>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/Adler32.xml b/docs/Mono.Android/en/Java.Util.Zip/Adler32.xml
index bd65a4da7b..13f7db561e 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/Adler32.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/Adler32.xml
@@ -263,14 +263,12 @@
         <Parameter Name="buffer" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="buffer">To be added.</param>
-        <param name="b">the byte to update the checksum with</param>
-        <summary>Updates the checksum with the specified byte (the low eight
-            bits of the argument b).</summary>
+        <param name="buffer">the ByteBuffer to update the checksum with</param>
+        <summary>Updates the checksum with the bytes from the specified buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Adler32#update(int)" title="Reference documentation">Java documentation for <code>java.util.zip.Adler32.update(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Adler32#update(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.util.zip.Adler32.update(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -304,13 +302,12 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">the byte to update the checksum with</param>
-        <summary>Updates the checksum with the specified byte (the low eight
-            bits of the argument b).</summary>
+        <param name="b">the byte array to update the checksum with</param>
+        <summary>Updates the checksum with the specified array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Adler32#update(int)" title="Reference documentation">Java documentation for <code>java.util.zip.Adler32.update(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Adler32#update(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Adler32.update(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -394,15 +391,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="b">the byte to update the checksum with</param>
         <param name="off">To be added.</param>
         <param name="len">To be added.</param>
-        <param name="b">the byte to update the checksum with</param>
-        <summary>Updates the checksum with the specified byte (the low eight
-            bits of the argument b).</summary>
+        <summary>Updates the checksum with the specified array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Adler32#update(int)" title="Reference documentation">Java documentation for <code>java.util.zip.Adler32.update(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Adler32#update(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Adler32.update(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/CRC32.xml b/docs/Mono.Android/en/Java.Util.Zip/CRC32.xml
index ff6789330b..b3a87d4830 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/CRC32.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/CRC32.xml
@@ -262,14 +262,12 @@
         <Parameter Name="buffer" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="buffer">To be added.</param>
-        <param name="b">the byte to update the checksum with</param>
-        <summary>Updates the CRC-32 checksum with the specified byte (the low
-            eight bits of the argument b).</summary>
+        <param name="buffer">the ByteBuffer to update the checksum with</param>
+        <summary>Updates the checksum with the bytes from the specified buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/CRC32#update(int)" title="Reference documentation">Java documentation for <code>java.util.zip.CRC32.update(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/CRC32#update(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.util.zip.CRC32.update(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -303,13 +301,12 @@
         <Parameter Name="b" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="b">the byte to update the checksum with</param>
-        <summary>Updates the CRC-32 checksum with the specified byte (the low
-            eight bits of the argument b).</summary>
+        <param name="b">the array of bytes to update the checksum with</param>
+        <summary>Updates the CRC-32 checksum with the specified array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/CRC32#update(int)" title="Reference documentation">Java documentation for <code>java.util.zip.CRC32.update(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/CRC32#update(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.CRC32.update(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -393,15 +390,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="b">the byte to update the checksum with</param>
         <param name="off">To be added.</param>
         <param name="len">To be added.</param>
-        <param name="b">the byte to update the checksum with</param>
-        <summary>Updates the CRC-32 checksum with the specified byte (the low
-            eight bits of the argument b).</summary>
+        <summary>Updates the CRC-32 checksum with the specified array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/CRC32#update(int)" title="Reference documentation">Java documentation for <code>java.util.zip.CRC32.update(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/CRC32#update(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.CRC32.update(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/DataFormatException.xml b/docs/Mono.Android/en/Java.Util.Zip/DataFormatException.xml
index 8c88dfbde0..a12b6d1396 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/DataFormatException.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/DataFormatException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a DataFormatException with no detail message.</summary>
+        <param name="s">the String containing a detail message</param>
+        <summary>Constructs a DataFormatException with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DataFormatException#DataFormatException()" title="Reference documentation">Java documentation for <code>java.util.zip.DataFormatException.DataFormatException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DataFormatException#DataFormatException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.zip.DataFormatException.DataFormatException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/Deflater.xml b/docs/Mono.Android/en/Java.Util.Zip/Deflater.xml
index 1244ae39f4..0ba01875d4 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/Deflater.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/Deflater.xml
@@ -88,12 +88,12 @@
         <Parameter Name="level" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="level">To be added.</param>
-        <summary>Creates a new compressor with the default compression level.</summary>
+        <param name="level">the compression level (0-9)</param>
+        <summary>Creates a new compressor using the specified compression level.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Deflater#Deflater()" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.Deflater()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Deflater#Deflater(int)" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.Deflater(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +126,13 @@
         <Parameter Name="nowrap" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="level">To be added.</param>
-        <param name="nowrap">To be added.</param>
-        <summary>Creates a new compressor with the default compression level.</summary>
+        <param name="level">the compression level (0-9)</param>
+        <param name="nowrap">if true then use GZIP compatible compression</param>
+        <summary>Creates a new compressor using the specified compression level.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Deflater#Deflater()" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.Deflater()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Deflater#Deflater(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.Deflater(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -494,9 +494,9 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the buffer for the compressed data</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the maximum number of bytes of compressed data</param>
         <summary>Compresses the input data and fills specified buffer with compressed
             data.</summary>
         <returns>the actual number of bytes of compressed data written to the
@@ -504,7 +504,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Deflater#deflate(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.deflate(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Deflater#deflate(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.deflate(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -542,18 +542,18 @@
         <Parameter Name="flush" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="flush">one of <see cref="P:Java.Util.Zip.Deflater.NoFlush" />, <see cref="P:Java.Util.Zip.Deflater.SyncFlush" /> or <see cref="P:Java.Util.Zip.Deflater.FullFlush" />.</param>
         <param name="b">the buffer for the compressed data</param>
-        <summary>Compresses the input data and fills specified buffer with compressed
+        <param name="off">the start offset of the data</param>
+        <param name="len">the maximum number of bytes of compressed data</param>
+        <param name="flush">the compression flush mode</param>
+        <summary>Compresses the input data and fills the specified buffer with compressed
             data.</summary>
-        <returns>the actual number of bytes of compressed data written to the
-                    output buffer</returns>
+        <returns>the actual number of bytes of compressed data written to
+                    the output buffer</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Deflater#deflate(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.deflate(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Deflater#deflate(byte[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.deflate(byte[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1162,14 +1162,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the dictionary data bytes</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the length of the data</param>
         <summary>Sets preset dictionary for compression.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Deflater#setDictionary(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.setDictionary(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Deflater#setDictionary(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.setDictionary(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1246,14 +1246,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the input data bytes</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the length of the data</param>
         <summary>Sets input data for compression.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Deflater#setInput(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.setInput(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Deflater#setInput(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Deflater.setInput(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/DeflaterInputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/DeflaterInputStream.xml
index ac2bb15253..85cee86de2 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/DeflaterInputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/DeflaterInputStream.xml
@@ -112,14 +112,14 @@
         <Parameter Name="defl" Type="Java.Util.Zip.Deflater" />
       </Parameters>
       <Docs>
-        <param name="defl">To be added.</param>
         <param name="in">input stream to read the uncompressed data to</param>
-        <summary>Creates a new input stream with a default compressor and buffer
-            size.</summary>
+        <param name="defl">compressor ("deflater") for this stream</param>
+        <summary>Creates a new input stream with the specified compressor and a
+            default buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream#DeflaterInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterInputStream.DeflaterInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream#DeflaterInputStream(java.io.InputStream,%20java.util.zip.Deflater)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterInputStream.DeflaterInputStream(java.io.InputStream, java.util.zip.Deflater)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,15 +153,15 @@
         <Parameter Name="bufLen" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="defl">To be added.</param>
-        <param name="bufLen">To be added.</param>
         <param name="in">input stream to read the uncompressed data to</param>
-        <summary>Creates a new input stream with a default compressor and buffer
+        <param name="defl">compressor ("deflater") for this stream</param>
+        <param name="bufLen">compression buffer size</param>
+        <summary>Creates a new input stream with the specified compressor and buffer
             size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream#DeflaterInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterInputStream.DeflaterInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream#DeflaterInputStream(java.io.InputStream,%20java.util.zip.Deflater,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterInputStream.DeflaterInputStream(java.io.InputStream, java.util.zip.Deflater, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/DeflaterOutputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/DeflaterOutputStream.xml
index ca4e7359fd..dfae031cd7 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/DeflaterOutputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/DeflaterOutputStream.xml
@@ -116,13 +116,14 @@
         <Parameter Name="def" Type="Java.Util.Zip.Deflater" />
       </Parameters>
       <Docs>
-        <param name="def">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default compressor and buffer size.</summary>
+        <param name="def">the compressor ("deflater")</param>
+        <summary>Creates a new output stream with the specified compressor and
+            a default buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream,%20java.util.zip.Deflater)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,13 +156,17 @@
         <Parameter Name="syncFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="syncFlush">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default compressor and buffer size.</summary>
+        <param name="syncFlush">if <c>true</c> the <c>#flush()</c> method of this
+                   instance flushes the compressor with flush mode
+                   <c>Deflater#SYNC_FLUSH</c> before flushing the output
+                   stream, otherwise only flushes the output stream</param>
+        <summary>Creates a new output stream with a default compressor, a default
+            buffer size and the specified flush mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -194,14 +199,18 @@
         <Parameter Name="syncFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="def">To be added.</param>
-        <param name="syncFlush">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default compressor and buffer size.</summary>
+        <param name="def">the compressor ("deflater")</param>
+        <param name="syncFlush">if <c>true</c> the <c>#flush()</c> method of this
+                   instance flushes the compressor with flush mode
+                   <c>Deflater#SYNC_FLUSH</c> before flushing the output
+                   stream, otherwise only flushes the output stream</param>
+        <summary>Creates a new output stream with the specified compressor, flush
+            mode and a default buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream,%20java.util.zip.Deflater,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -234,14 +243,15 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="def">To be added.</param>
-        <param name="size">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default compressor and buffer size.</summary>
+        <param name="def">the compressor ("deflater")</param>
+        <param name="size">the output buffer size</param>
+        <summary>Creates a new output stream with the specified compressor and
+            buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream,%20java.util.zip.Deflater,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -276,15 +286,19 @@
         <Parameter Name="syncFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="def">To be added.</param>
-        <param name="size">To be added.</param>
-        <param name="syncFlush">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default compressor and buffer size.</summary>
+        <param name="def">the compressor ("deflater")</param>
+        <param name="size">the output buffer size</param>
+        <param name="syncFlush">if <c>true</c> the <c>#flush()</c> method of this
+                   instance flushes the compressor with flush mode
+                   <c>Deflater#SYNC_FLUSH</c> before flushing the output
+                   stream, otherwise only flushes the output stream</param>
+        <summary>Creates a new output stream with the specified compressor,
+            buffer size and flush mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream#DeflaterOutputStream(java.io.OutputStream,%20java.util.zip.Deflater,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.zip.DeflaterOutputStream.DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/GZIPInputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/GZIPInputStream.xml
index bb7e92e0ca..f752a8e389 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/GZIPInputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/GZIPInputStream.xml
@@ -118,13 +118,13 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
         <param name="in">the input stream</param>
-        <summary>Creates a new input stream with a default buffer size.</summary>
+        <param name="size">the input buffer size</param>
+        <summary>Creates a new input stream with the specified buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/GZIPInputStream#GZIPInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPInputStream.GZIPInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/GZIPInputStream#GZIPInputStream(java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPInputStream.GZIPInputStream(java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/GZIPOutputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/GZIPOutputStream.xml
index eb1cf205b3..d6f94d22e6 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/GZIPOutputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/GZIPOutputStream.xml
@@ -117,13 +117,18 @@
         <Parameter Name="syncFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="syncFlush">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default buffer size.</summary>
+        <param name="syncFlush">if <c>true</c> invocation of the inherited
+                   <c>DeflaterOutputStream#flush() flush()</c> method of
+                   this instance flushes the compressor with flush mode
+                   <c>Deflater#SYNC_FLUSH</c> before flushing the output
+                   stream, otherwise only flushes the output stream</param>
+        <summary>Creates a new output stream with a default buffer size and
+            the specified flush mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream#GZIPOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPOutputStream.GZIPOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream#GZIPOutputStream(java.io.OutputStream,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPOutputStream.GZIPOutputStream(java.io.OutputStream, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,13 +161,13 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default buffer size.</summary>
+        <param name="size">the output buffer size</param>
+        <summary>Creates a new output stream with the specified buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream#GZIPOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPOutputStream.GZIPOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream#GZIPOutputStream(java.io.OutputStream,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPOutputStream.GZIPOutputStream(java.io.OutputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -197,14 +202,19 @@
         <Parameter Name="syncFlush" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="size">To be added.</param>
-        <param name="syncFlush">To be added.</param>
         <param name="out">the output stream</param>
-        <summary>Creates a new output stream with a default buffer size.</summary>
+        <param name="size">the output buffer size</param>
+        <param name="syncFlush">if <c>true</c> invocation of the inherited
+                   <c>DeflaterOutputStream#flush() flush()</c> method of
+                   this instance flushes the compressor with flush mode
+                   <c>Deflater#SYNC_FLUSH</c> before flushing the output
+                   stream, otherwise only flushes the output stream</param>
+        <summary>Creates a new output stream with the specified buffer size and
+            flush mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream#GZIPOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPOutputStream.GZIPOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream#GZIPOutputStream(java.io.OutputStream,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.zip.GZIPOutputStream.GZIPOutputStream(java.io.OutputStream, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/IChecksum.xml b/docs/Mono.Android/en/Java.Util.Zip/IChecksum.xml
index d279869196..e097a94405 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/IChecksum.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/IChecksum.xml
@@ -143,14 +143,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">the initial position in <c>buf</c> to read the bytes from.</param>
-        <param name="len">To be added.</param>
-        <param name="b">the byte to update the checksum with</param>
-        <summary>Updates the current checksum with the specified byte.</summary>
+        <param name="b">the byte array to update the checksum with</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the number of bytes to use for the update</param>
+        <summary>Updates the current checksum with the specified array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Checksum#update(int)" title="Reference documentation">Java documentation for <code>java.util.zip.Checksum.update(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Checksum#update(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Checksum.update(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/Inflater.xml b/docs/Mono.Android/en/Java.Util.Zip/Inflater.xml
index 37b9e93e30..0a49bd6c64 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/Inflater.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/Inflater.xml
@@ -88,12 +88,12 @@
         <Parameter Name="nowrap" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="nowrap">To be added.</param>
+        <param name="nowrap">if true then support GZIP compatible compression</param>
         <summary>Creates a new decompressor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Inflater#Inflater()" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.Inflater()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Inflater#Inflater(boolean)" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.Inflater(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -385,15 +385,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the buffer for the uncompressed data</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the maximum number of uncompressed bytes</param>
         <summary>Uncompresses bytes into specified buffer.</summary>
         <returns>the actual number of uncompressed bytes</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Inflater#inflate(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.inflate(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Inflater#inflate(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.inflate(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -707,14 +707,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the dictionary data bytes</param>
+        <param name="off">the start offset of the data</param>
+        <param name="len">the length of the data</param>
         <summary>Sets the preset dictionary to the given array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Inflater#setDictionary(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.setDictionary(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Inflater#setDictionary(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.setDictionary(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -791,14 +791,14 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="off">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="b">the input data bytes</param>
+        <param name="off">the start offset of the input data</param>
+        <param name="len">the length of the input data</param>
         <summary>Sets input data for decompression.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/Inflater#setInput(byte[])" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.setInput(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/Inflater#setInput(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.Inflater.setInput(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/InflaterInputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/InflaterInputStream.xml
index 5154460c00..56b127fc12 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/InflaterInputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/InflaterInputStream.xml
@@ -116,13 +116,14 @@
         <Parameter Name="inf" Type="Java.Util.Zip.Inflater" />
       </Parameters>
       <Docs>
-        <param name="inf">To be added.</param>
         <param name="in">the input stream</param>
-        <summary>Creates a new input stream with a default decompressor and buffer size.</summary>
+        <param name="inf">the decompressor ("inflater")</param>
+        <summary>Creates a new input stream with the specified decompressor and a
+            default buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/InflaterInputStream#InflaterInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterInputStream.InflaterInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/InflaterInputStream#InflaterInputStream(java.io.InputStream,%20java.util.zip.Inflater)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterInputStream.InflaterInputStream(java.io.InputStream, java.util.zip.Inflater)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,14 +157,15 @@
         <Parameter Name="size" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="inf">To be added.</param>
-        <param name="size">To be added.</param>
         <param name="in">the input stream</param>
-        <summary>Creates a new input stream with a default decompressor and buffer size.</summary>
+        <param name="inf">the decompressor ("inflater")</param>
+        <param name="size">the input buffer size</param>
+        <summary>Creates a new input stream with the specified decompressor and
+            buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/InflaterInputStream#InflaterInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterInputStream.InflaterInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/InflaterInputStream#InflaterInputStream(java.io.InputStream,%20java.util.zip.Inflater,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterInputStream.InflaterInputStream(java.io.InputStream, java.util.zip.Inflater, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/InflaterOutputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/InflaterOutputStream.xml
index e0f82a1c2e..2b289b2950 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/InflaterOutputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/InflaterOutputStream.xml
@@ -112,14 +112,14 @@
         <Parameter Name="infl" Type="Java.Util.Zip.Inflater" />
       </Parameters>
       <Docs>
-        <param name="infl">To be added.</param>
         <param name="out">output stream to write the uncompressed data to</param>
-        <summary>Creates a new output stream with a default decompressor and buffer
-            size.</summary>
+        <param name="infl">decompressor ("inflater") for this stream</param>
+        <summary>Creates a new output stream with the specified decompressor and a
+            default buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream#InflaterOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterOutputStream.InflaterOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream#InflaterOutputStream(java.io.OutputStream,%20java.util.zip.Inflater)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterOutputStream.InflaterOutputStream(java.io.OutputStream, java.util.zip.Inflater)</code>.</a>
             </format>
           </para>
           <para>
@@ -153,15 +153,15 @@
         <Parameter Name="bufLen" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="infl">To be added.</param>
-        <param name="bufLen">To be added.</param>
         <param name="out">output stream to write the uncompressed data to</param>
-        <summary>Creates a new output stream with a default decompressor and buffer
-            size.</summary>
+        <param name="infl">decompressor ("inflater") for this stream</param>
+        <param name="bufLen">decompression buffer size</param>
+        <summary>Creates a new output stream with the specified decompressor and
+            buffer size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream#InflaterOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterOutputStream.InflaterOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream#InflaterOutputStream(java.io.OutputStream,%20java.util.zip.Inflater,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.InflaterOutputStream.InflaterOutputStream(java.io.OutputStream, java.util.zip.Inflater, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipEntry.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipEntry.xml
index e081846e89..10b9d6f362 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipEntry.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipEntry.xml
@@ -67,12 +67,13 @@
         <Parameter Name="e" Type="Java.Util.Zip.ZipEntry" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <summary>Creates a new un-initialized zip entry</summary>
+        <param name="e">A zip Entry object</param>
+        <summary>Creates a new zip entry with fields taken from the specified
+            zip entry.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipEntry#ZipEntry()" title="Reference documentation">Java documentation for <code>java.util.zip.ZipEntry.ZipEntry()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipEntry#ZipEntry(java.util.zip.ZipEntry)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipEntry.ZipEntry(java.util.zip.ZipEntry)</code>.</a>
             </format>
           </para>
           <para>
@@ -104,12 +105,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Creates a new un-initialized zip entry</summary>
+        <param name="name">The entry name</param>
+        <summary>Creates a new zip entry with the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipEntry#ZipEntry()" title="Reference documentation">Java documentation for <code>java.util.zip.ZipEntry.ZipEntry()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipEntry#ZipEntry(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipEntry.ZipEntry(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml
index 08b6309ccb..c7ecd60440 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;ZipException&lt;/code&gt; with &lt;code&gt;null&lt;/code&gt;
-            as its error detail message.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;ZipException&lt;/code&gt; with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipException#ZipException()" title="Reference documentation">Java documentation for <code>java.util.zip.ZipException.ZipException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipException#ZipException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipException.ZipException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml
index 8be77ef750..f85c1d1012 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipFile.xml
@@ -107,13 +107,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="file">the ZIP file to be opened for reading</param>
-        <summary>Opens a ZIP file for reading given the specified File object.</summary>
+        <param name="name">the name of the zip file</param>
+        <summary>Opens a zip file for reading.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -148,13 +147,17 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="charset">To be added.</param>
         <param name="file">the ZIP file to be opened for reading</param>
+        <param name="charset">The java.nio.charset.Charset charset to be
+                   used to decode the ZIP entry name and comment (ignored if
+                   the &lt;a href="package-summary.html#lang_encoding"&gt; language
+                   encoding bit&lt;/a&gt; of the ZIP entry's general purpose bit
+                   flag is set).</param>
         <summary>Opens a ZIP file for reading given the specified File object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,13 +189,14 @@
         <Parameter Name="mode" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
         <param name="file">the ZIP file to be opened for reading</param>
-        <summary>Opens a ZIP file for reading given the specified File object.</summary>
+        <param name="mode">the mode in which the file is to be opened</param>
+        <summary>Opens a new &lt;code&gt;ZipFile&lt;/code&gt; to read from the specified
+            &lt;code&gt;File&lt;/code&gt; object in the specified mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File,%20int)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -250,14 +254,16 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="charset">To be added.</param>
-        <param name="file">the ZIP file to be opened for reading</param>
-        <summary>Opens a ZIP file for reading given the specified File object.</summary>
+        <param name="name">the name of the zip file</param>
+        <param name="charset">the java.nio.charset.Charset charset to
+                   be used to decode the ZIP entry name and comment that are not
+                   encoded by using UTF-8 encoding (indicated by entry's general
+                   purpose flag).</param>
+        <summary>Opens a zip file for reading.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.lang.String,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.lang.String, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
@@ -290,14 +296,18 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
-        <param name="charset">To be added.</param>
         <param name="file">the ZIP file to be opened for reading</param>
-        <summary>Opens a ZIP file for reading given the specified File object.</summary>
+        <param name="mode">the mode in which the file is to be opened</param>
+        <param name="charset">the java.nio.charset.Charset charset to
+                   be used to decode the ZIP entry name and comment that are not
+                   encoded by using UTF-8 encoding (indicated by entry's general
+                   purpose flag).</param>
+        <summary>Opens a new &lt;code&gt;ZipFile&lt;/code&gt; to read from the specified
+            &lt;code&gt;File&lt;/code&gt; object in the specified mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipFile#ZipFile(java.io.File,%20int,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipFile.ZipFile(java.io.File, int, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml
index 98a856b888..476d57e394 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipInputStream.xml
@@ -116,13 +116,17 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="charset">To be added.</param>
         <param name="in">the actual input stream</param>
+        <param name="charset">The java.nio.charset.Charset charset to be
+                   used to decode the ZIP entry name (ignored if the
+                   &lt;a href="package-summary.html#lang_encoding"&gt; language
+                   encoding bit&lt;/a&gt; of the ZIP entry's general purpose bit
+                   flag is set).</param>
         <summary>Creates a new ZIP input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipInputStream#ZipInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipInputStream.ZipInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipInputStream#ZipInputStream(java.io.InputStream,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipInputStream.ZipInputStream(java.io.InputStream, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util.Zip/ZipOutputStream.xml b/docs/Mono.Android/en/Java.Util.Zip/ZipOutputStream.xml
index e06bc157e1..cc8e78e3c0 100644
--- a/docs/Mono.Android/en/Java.Util.Zip/ZipOutputStream.xml
+++ b/docs/Mono.Android/en/Java.Util.Zip/ZipOutputStream.xml
@@ -116,13 +116,14 @@
         <Parameter Name="charset" Type="Java.Nio.Charset.Charset" />
       </Parameters>
       <Docs>
-        <param name="charset">To be added.</param>
         <param name="out">the actual output stream</param>
+        <param name="charset">the java.nio.charset.Charset charset
+                           to be used to encode the entry names and comments</param>
         <summary>Creates a new ZIP output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/zip/ZipOutputStream#ZipOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipOutputStream.ZipOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/zip/ZipOutputStream#ZipOutputStream(java.io.OutputStream,%20java.nio.charset.Charset)" title="Reference documentation">Java documentation for <code>java.util.zip.ZipOutputStream.ZipOutputStream(java.io.OutputStream, java.nio.charset.Charset)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/AbstractCollection.xml b/docs/Mono.Android/en/Java.Util/AbstractCollection.xml
index eaed30ab77..e4dc3d27d5 100644
--- a/docs/Mono.Android/en/Java.Util/AbstractCollection.xml
+++ b/docs/Mono.Android/en/Java.Util/AbstractCollection.xml
@@ -755,7 +755,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/AbstractCollection#toArray()" title="Reference documentation">Java documentation for <code>java.util.AbstractCollection.toArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/AbstractCollection#toArray(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.AbstractCollection.toArray(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/AbstractList.xml b/docs/Mono.Android/en/Java.Util/AbstractList.xml
index a324b9616d..8d1218f932 100644
--- a/docs/Mono.Android/en/Java.Util/AbstractList.xml
+++ b/docs/Mono.Android/en/Java.Util/AbstractList.xml
@@ -487,7 +487,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/AbstractList#listIterator()" title="Reference documentation">Java documentation for <code>java.util.AbstractList.listIterator()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/AbstractList#listIterator(int)" title="Reference documentation">Java documentation for <code>java.util.AbstractList.listIterator(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ArrayDeque.xml b/docs/Mono.Android/en/Java.Util/ArrayDeque.xml
index 61f77be61b..2ee689679c 100644
--- a/docs/Mono.Android/en/Java.Util/ArrayDeque.xml
+++ b/docs/Mono.Android/en/Java.Util/ArrayDeque.xml
@@ -121,13 +121,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs an empty array deque with an initial capacity
-            sufficient to hold 16 elements.</summary>
+        <param name="c">the collection whose elements are to be placed into the deque</param>
+        <summary>Constructs a deque containing the elements of the specified
+            collection, in the order they are returned by the collection's
+            iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ArrayDeque#ArrayDeque()" title="Reference documentation">Java documentation for <code>java.util.ArrayDeque.ArrayDeque()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ArrayDeque#ArrayDeque(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.ArrayDeque.ArrayDeque(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -158,13 +159,13 @@
         <Parameter Name="numElements" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="numElements">To be added.</param>
+        <param name="numElements">lower bound on initial capacity of the deque</param>
         <summary>Constructs an empty array deque with an initial capacity
-            sufficient to hold 16 elements.</summary>
+            sufficient to hold the specified number of elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ArrayDeque#ArrayDeque()" title="Reference documentation">Java documentation for <code>java.util.ArrayDeque.ArrayDeque()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ArrayDeque#ArrayDeque(int)" title="Reference documentation">Java documentation for <code>java.util.ArrayDeque.ArrayDeque(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ArrayList.xml b/docs/Mono.Android/en/Java.Util/ArrayList.xml
index 2048648c8f..bf23d49ef4 100644
--- a/docs/Mono.Android/en/Java.Util/ArrayList.xml
+++ b/docs/Mono.Android/en/Java.Util/ArrayList.xml
@@ -119,12 +119,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs an empty list with an initial capacity of ten.</summary>
+        <param name="c">the collection whose elements are to be placed into this list</param>
+        <summary>Constructs a list containing the elements of the specified
+            collection, in the order they are returned by the collection's
+            iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ArrayList#ArrayList()" title="Reference documentation">Java documentation for <code>java.util.ArrayList.ArrayList()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ArrayList#ArrayList(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.ArrayList.ArrayList(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,12 +157,12 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Constructs an empty list with an initial capacity of ten.</summary>
+        <param name="initialCapacity">the initial capacity of the list</param>
+        <summary>Constructs an empty list with the specified initial capacity.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ArrayList#ArrayList()" title="Reference documentation">Java documentation for <code>java.util.ArrayList.ArrayList()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ArrayList#ArrayList(int)" title="Reference documentation">Java documentation for <code>java.util.ArrayList.ArrayList(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Arrays.xml b/docs/Mono.Android/en/Java.Util/Arrays.xml
index 25333b8f00..955306af86 100644
--- a/docs/Mono.Android/en/Java.Util/Arrays.xml
+++ b/docs/Mono.Android/en/Java.Util/Arrays.xml
@@ -99,7 +99,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#asList(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Arrays.asList(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#asList(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.asList(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -136,8 +136,8 @@
       <Docs>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
+        <summary>Searches the specified array for the specified object using the binary
+            search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
@@ -149,7 +149,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(java.lang.Object[],%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(java.lang.Object[], java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -241,7 +241,7 @@
       <Docs>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
+        <summary>Searches the specified array of chars for the specified value using the
             binary search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
@@ -254,7 +254,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(char[],%20char)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(char[], char)</code>.</a>
             </format>
           </para>
           <para>
@@ -292,8 +292,8 @@
       <Docs>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
+        <summary>Searches the specified array of doubles for the specified value using
+            the binary search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
@@ -305,7 +305,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(double[],%20double)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(double[], double)</code>.</a>
             </format>
           </para>
           <para>
@@ -343,8 +343,8 @@
       <Docs>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
+        <summary>Searches the specified array of shorts for the specified value using
+            the binary search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
@@ -356,7 +356,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(short[],%20short)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(short[], short)</code>.</a>
             </format>
           </para>
           <para>
@@ -394,7 +394,7 @@
       <Docs>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
+        <summary>Searches the specified array of ints for the specified value using the
             binary search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
@@ -407,7 +407,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(int[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(int[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -445,7 +445,7 @@
       <Docs>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
+        <summary>Searches the specified array of longs for the specified value using the
             binary search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
@@ -458,7 +458,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(long[],%20long)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(long[], long)</code>.</a>
             </format>
           </para>
           <para>
@@ -496,20 +496,20 @@
       <Docs>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
+        <summary>Searches the specified array of floats for the specified value using
+            the binary search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
-                    otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
+                    otherwise, <c>(-(<i>insertion point</i>) - 1)</c>. The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
                     element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    elements in the array are less than the specified key. Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(float[],%20float)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(float[], float)</code>.</a>
             </format>
           </para>
           <para>
@@ -550,11 +550,14 @@
         <Parameter Name="c" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the array</param>
         <param name="a">the array to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
+        <param name="c">the comparator by which the array is ordered.  A
+                   <c>null</c> value indicates that the elements'
+                   Comparable natural ordering should be used.</param>
+        <summary>Searches the specified array for the specified object using the binary
+            search algorithm.</summary>
         <returns>index of the search key, if it is contained in the array;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
@@ -566,7 +569,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(java.lang.Object[],%20java.lang.Object,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(java.lang.Object[], java.lang.Object, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -603,24 +606,28 @@
         <Parameter Name="key" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <summary>Searches a range of
+            the specified array for the specified object using the binary
+            search algorithm.</summary>
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(java.lang.Object[],%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(java.lang.Object[], int, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -662,24 +669,28 @@
         <Parameter Name="key" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
+        <summary>Searches a range of
+            the specified array of bytes for the specified value using the
             binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20int,%20int,%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], int, int, byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -719,24 +730,28 @@
         <Parameter Name="key" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
+        <summary>Searches a range of
+            the specified array of chars for the specified value using the
             binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(char[],%20int,%20int,%20char)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(char[], int, int, char)</code>.</a>
             </format>
           </para>
           <para>
@@ -776,24 +791,28 @@
         <Parameter Name="key" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <summary>Searches a range of
+            the specified array of doubles for the specified value using
+            the binary search algorithm.</summary>
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(double[],%20int,%20int,%20double)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(double[], int, int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -833,24 +852,28 @@
         <Parameter Name="key" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <summary>Searches a range of
+            the specified array of shorts for the specified value using
+            the binary search algorithm.</summary>
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(short[],%20int,%20int,%20short)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(short[], int, int, short)</code>.</a>
             </format>
           </para>
           <para>
@@ -890,24 +913,28 @@
         <Parameter Name="key" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
+        <summary>Searches a range of
+            the specified array of ints for the specified value using the
             binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(int[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(int[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -947,24 +974,28 @@
         <Parameter Name="key" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
+        <summary>Searches a range of
+            the specified array of longs for the specified value using the
             binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(long[],%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(long[], int, int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1004,24 +1035,28 @@
         <Parameter Name="key" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
-                    otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
+        <summary>Searches a range of
+            the specified array of floats for the specified value using
+            the binary search algorithm.</summary>
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
+                    otherwise, <c>(-(<i>insertion point</i>) - 1)</c>. The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key. Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(float[],%20int,%20int,%20float)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(float[], int, int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1066,25 +1101,32 @@
         <Parameter Name="c" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="c">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the array</param>
         <param name="a">the array to be searched</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                     searched</param>
+        <param name="toIndex">the index of the last element (exclusive) to be searched</param>
         <param name="key">the value to be searched for</param>
-        <summary>Searches the specified array of bytes for the specified value using the
-            binary search algorithm.</summary>
-        <returns>index of the search key, if it is contained in the array;
+        <param name="c">the comparator by which the array is ordered.  A
+                   <c>null</c> value indicates that the elements'
+                   Comparable natural ordering should be used.</param>
+        <summary>Searches a range of
+            the specified array for the specified object using the binary
+            search algorithm.</summary>
+        <returns>index of the search key, if it is contained in the array
+                    within the specified range;
                     otherwise, <c>(-(<i>insertion point</i>) - 1)</c>.  The
                     <i>insertion point</i> is defined as the point at which the
                     key would be inserted into the array: the index of the first
-                    element greater than the key, or <c>a.length</c> if all
-                    elements in the array are less than the specified key.  Note
+                    element in the range greater than the key,
+                    or <c>toIndex</c> if all
+                    elements in the range are less than the specified key.  Note
                     that this guarantees that the return value will be &amp;gt;= 0 if
                     and only if the key is found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#binarySearch(java.lang.Object[],%20int,%20int,%20java.lang.Object,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.binarySearch(java.lang.Object[], int, int, java.lang.Object, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -1123,16 +1165,17 @@
         <Parameter Name="newLength" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the array</param>
         <param name="original">the array to be copied</param>
         <param name="newLength">the length of the copy to be returned</param>
-        <summary>Copies the specified array, truncating or padding with zeros (if necessary)
+        <summary>Copies the specified array, truncating or padding with nulls (if necessary)
             so the copy has the specified length.</summary>
-        <returns>a copy of the original array, truncated or padded with zeros
+        <returns>a copy of the original array, truncated or padded with nulls
                 to obtain the specified length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(java.lang.Object[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(java.lang.Object[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1169,14 +1212,14 @@
       <Docs>
         <param name="original">the array to be copied</param>
         <param name="newLength">the length of the copy to be returned</param>
-        <summary>Copies the specified array, truncating or padding with zeros (if necessary)
+        <summary>Copies the specified array, truncating or padding with <c>false</c> (if necessary)
             so the copy has the specified length.</summary>
-        <returns>a copy of the original array, truncated or padded with zeros
+        <returns>a copy of the original array, truncated or padded with false elements
                 to obtain the specified length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(boolean[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(boolean[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1263,14 +1306,14 @@
       <Docs>
         <param name="original">the array to be copied</param>
         <param name="newLength">the length of the copy to be returned</param>
-        <summary>Copies the specified array, truncating or padding with zeros (if necessary)
+        <summary>Copies the specified array, truncating or padding with null characters (if necessary)
             so the copy has the specified length.</summary>
-        <returns>a copy of the original array, truncated or padded with zeros
+        <returns>a copy of the original array, truncated or padded with null characters
                 to obtain the specified length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(char[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(char[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1317,7 +1360,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(double[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(double[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1364,7 +1407,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(short[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(short[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1411,7 +1454,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(int[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(int[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1458,7 +1501,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(long[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(long[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1505,7 +1548,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(float[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(float[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1548,17 +1591,19 @@
         <Parameter Name="newType" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="newType">To be added.</param>
+        <param name="&lt;U&gt;&lt;U&gt;">the class of the objects in the original array</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the returned array</param>
         <param name="original">the array to be copied</param>
         <param name="newLength">the length of the copy to be returned</param>
-        <summary>Copies the specified array, truncating or padding with zeros (if necessary)
+        <param name="newType">the class of the copy to be returned</param>
+        <summary>Copies the specified array, truncating or padding with nulls (if necessary)
             so the copy has the specified length.</summary>
-        <returns>a copy of the original array, truncated or padded with zeros
+        <returns>a copy of the original array, truncated or padded with nulls
                 to obtain the specified length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(byte[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOf(java.lang.Object[],%20int,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOf(java.lang.Object[], int, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -1598,17 +1643,18 @@
         <Parameter Name="to" Type="System.Int32" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the array</param>
         <param name="original">the array from which a range is to be copied</param>
         <param name="from">the initial index of the range to be copied, inclusive</param>
         <param name="to">the final index of the range to be copied, exclusive.
                 (This index may lie outside the array.)</param>
         <summary>Copies the specified range of the specified array into a new array.</summary>
         <returns>a new array containing the specified range from the original array,
-                truncated or padded with zeros to obtain the required length</returns>
+                truncated or padded with nulls to obtain the required length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(java.lang.Object[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(java.lang.Object[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1650,11 +1696,11 @@
                 (This index may lie outside the array.)</param>
         <summary>Copies the specified range of the specified array into a new array.</summary>
         <returns>a new array containing the specified range from the original array,
-                truncated or padded with zeros to obtain the required length</returns>
+                truncated or padded with false elements to obtain the required length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(boolean[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(boolean[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1750,11 +1796,11 @@
                 (This index may lie outside the array.)</param>
         <summary>Copies the specified range of the specified array into a new array.</summary>
         <returns>a new array containing the specified range from the original array,
-                truncated or padded with zeros to obtain the required length</returns>
+                truncated or padded with null characters to obtain the required length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1804,7 +1850,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(double[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(double[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1854,7 +1900,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1904,7 +1950,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1954,7 +2000,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(long[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(long[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2004,7 +2050,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2049,18 +2095,20 @@
         <Parameter Name="newType" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="newType">To be added.</param>
+        <param name="&lt;U&gt;&lt;U&gt;">the class of the objects in the original array</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the returned array</param>
         <param name="original">the array from which a range is to be copied</param>
         <param name="from">the initial index of the range to be copied, inclusive</param>
         <param name="to">the final index of the range to be copied, exclusive.
                 (This index may lie outside the array.)</param>
+        <param name="newType">the class of the copy to be returned</param>
         <summary>Copies the specified range of the specified array into a new array.</summary>
         <returns>a new array containing the specified range from the original array,
-                truncated or padded with zeros to obtain the required length</returns>
+                truncated or padded with nulls to obtain the required length</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(byte[], int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#copyOfRange(java.lang.Object[],%20int,%20int,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>java.util.Arrays.copyOfRange(java.lang.Object[], int, int, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -2226,14 +2274,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of Objects are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(java.lang.Object[],%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(java.lang.Object[], java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2271,14 +2319,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of booleans are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(boolean[],%20boolean[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(boolean[], boolean[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2361,14 +2409,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of chars are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(char[],%20char[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(char[], char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2406,14 +2454,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of doubles are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(double[],%20double[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(double[], double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2451,14 +2499,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of shorts are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(short[],%20short[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(short[], short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2496,14 +2544,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of ints are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(int[],%20int[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(int[], int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2541,14 +2589,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of longs are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(long[],%20long[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(long[], long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2586,14 +2634,14 @@
       <Docs>
         <param name="a">one array to be tested for equality</param>
         <param name="a2">the other array to be tested for equality</param>
-        <summary>Returns <c>true</c> if the two specified arrays of bytes are
+        <summary>Returns <c>true</c> if the two specified arrays of floats are
             <i>equal</i> to one another.</summary>
         <returns>
           <c>true</c> if the two arrays are equal</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#equals(byte[],%20byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(byte[], byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#equals(float[],%20float[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.equals(float[], float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2631,12 +2679,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified Object reference to each element of the specified
+            array of Objects.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(java.lang.Object[],%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(java.lang.Object[], java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -2674,12 +2722,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified boolean value to each element of the specified
+            array of booleans.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(boolean[],%20boolean)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(boolean[], boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -2760,12 +2808,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified char value to each element of the specified array
+            of chars.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(char[],%20char)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(char[], char)</code>.</a>
             </format>
           </para>
           <para>
@@ -2803,12 +2851,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified double value to each element of the specified
+            array of doubles.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(double[],%20double)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(double[], double)</code>.</a>
             </format>
           </para>
           <para>
@@ -2846,12 +2894,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified short value to each element of the specified array
+            of shorts.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(short[],%20short)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(short[], short)</code>.</a>
             </format>
           </para>
           <para>
@@ -2889,12 +2937,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified int value to each element of the specified array
+            of ints.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(int[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(int[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2932,12 +2980,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified long value to each element of the specified array
+            of longs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(long[],%20long)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(long[], long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2975,12 +3023,12 @@
       <Docs>
         <param name="a">the array to be filled</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified float value to each element of the specified array
+            of floats.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(float[],%20float)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(float[], float)</code>.</a>
             </format>
           </para>
           <para>
@@ -3018,16 +3066,18 @@
         <Parameter Name="val" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified Object reference to each element of the specified
+            range of the specified array of Objects.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(java.lang.Object[],%20int,%20int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(java.lang.Object[], int, int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -3068,16 +3118,18 @@
         <Parameter Name="val" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified boolean value to each element of the specified
+            range of the specified array of booleans.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(boolean[],%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(boolean[], int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -3118,16 +3170,18 @@
         <Parameter Name="val" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified byte value to each element of the specified
+            range of the specified array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20int,%20int,%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], int, int, byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -3168,16 +3222,18 @@
         <Parameter Name="val" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified char value to each element of the specified
+            range of the specified array of chars.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(char[],%20int,%20int,%20char)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(char[], int, int, char)</code>.</a>
             </format>
           </para>
           <para>
@@ -3218,16 +3274,18 @@
         <Parameter Name="val" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified double value to each element of the specified
+            range of the specified array of doubles.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(double[],%20int,%20int,%20double)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(double[], int, int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -3268,16 +3326,18 @@
         <Parameter Name="val" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified short value to each element of the specified
+            range of the specified array of shorts.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(short[],%20int,%20int,%20short)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(short[], int, int, short)</code>.</a>
             </format>
           </para>
           <para>
@@ -3318,16 +3378,18 @@
         <Parameter Name="val" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified int value to each element of the specified
+            range of the specified array of ints.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(int[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(int[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3368,16 +3430,18 @@
         <Parameter Name="val" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified long value to each element of the specified
+            range of the specified array of longs.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(long[],%20int,%20int,%20long)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(long[], int, int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3418,16 +3482,18 @@
         <Parameter Name="val" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be filled</param>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   filled with the specified value</param>
+        <param name="toIndex">the index of the last element (exclusive) to be
+                   filled with the specified value</param>
         <param name="val">the value to be stored in all elements of the array</param>
-        <summary>Assigns the specified byte value to each element of the specified array
-            of bytes.</summary>
+        <summary>Assigns the specified float value to each element of the specified
+            range of the specified array of floats.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#fill(byte[],%20byte)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(byte[], byte)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#fill(float[],%20int,%20int,%20float)" title="Reference documentation">Java documentation for <code>java.util.Arrays.fill(float[], int, int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -3465,13 +3531,13 @@
         <Parameter Name="a" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="a">the array whose hash value to compute</param>
+        <param name="a">the array whose content-based hash code to compute</param>
         <summary>Returns a hash code based on the contents of the specified array.</summary>
         <returns>a content-based hash code for <c>a</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3512,7 +3578,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(boolean[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(boolean[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3594,7 +3660,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(char[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3635,7 +3701,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(double[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3676,7 +3742,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(short[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3717,7 +3783,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(int[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3758,7 +3824,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(long[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3799,7 +3865,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#hashCode(float[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.hashCode(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -3870,17 +3936,16 @@
         <Parameter Name="op" Type="Java.Util.Functions.IBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="array">the array</param>
-        <param name="fromIndex">the index of the first element, inclusive</param>
-        <param name="toIndex">the index of the last element, exclusive</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the array</param>
+        <param name="array">the array, which is modified in-place by this method</param>
         <param name="op">a side-effect-free, associative function to perform the
             cumulation</param>
-        <summary>Performs <c>#parallelPrefix(double[], DoubleBinaryOperator)</c>
-            for the given subrange of the array.</summary>
+        <summary>Cumulates, in parallel, each element of the given array in place,
+            using the supplied function.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20int,%20int,%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], int, int, java.util.function.DoubleBinaryOperator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(java.lang.Object[],%20java.util.function.BinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(java.lang.Object[], java.util.function.BinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -3915,17 +3980,14 @@
         <Parameter Name="op" Type="Java.Util.Functions.IDoubleBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="array">the array</param>
-        <param name="fromIndex">the index of the first element, inclusive</param>
-        <param name="toIndex">the index of the last element, exclusive</param>
-        <param name="op">a side-effect-free, associative function to perform the
-            cumulation</param>
-        <summary>Performs <c>#parallelPrefix(double[], DoubleBinaryOperator)</c>
-            for the given subrange of the array.</summary>
+        <param name="array">the array, which is modified in-place by this method</param>
+        <param name="op">a side-effect-free function to perform the cumulation</param>
+        <summary>Cumulates, in parallel, each element of the given array in place,
+            using the supplied function.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20int,%20int,%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], int, int, java.util.function.DoubleBinaryOperator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], java.util.function.DoubleBinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -3960,17 +4022,15 @@
         <Parameter Name="op" Type="Java.Util.Functions.IIntBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="array">the array</param>
-        <param name="fromIndex">the index of the first element, inclusive</param>
-        <param name="toIndex">the index of the last element, exclusive</param>
+        <param name="array">the array, which is modified in-place by this method</param>
         <param name="op">a side-effect-free, associative function to perform the
             cumulation</param>
-        <summary>Performs <c>#parallelPrefix(double[], DoubleBinaryOperator)</c>
-            for the given subrange of the array.</summary>
+        <summary>Cumulates, in parallel, each element of the given array in place,
+            using the supplied function.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20int,%20int,%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], int, int, java.util.function.DoubleBinaryOperator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(int[],%20java.util.function.IntBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(int[], java.util.function.IntBinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -4005,17 +4065,15 @@
         <Parameter Name="op" Type="Java.Util.Functions.ILongBinaryOperator" />
       </Parameters>
       <Docs>
-        <param name="array">the array</param>
-        <param name="fromIndex">the index of the first element, inclusive</param>
-        <param name="toIndex">the index of the last element, exclusive</param>
+        <param name="array">the array, which is modified in-place by this method</param>
         <param name="op">a side-effect-free, associative function to perform the
             cumulation</param>
-        <summary>Performs <c>#parallelPrefix(double[], DoubleBinaryOperator)</c>
-            for the given subrange of the array.</summary>
+        <summary>Cumulates, in parallel, each element of the given array in place,
+            using the supplied function.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20int,%20int,%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], int, int, java.util.function.DoubleBinaryOperator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(long[],%20java.util.function.LongBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(long[], java.util.function.LongBinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -4056,17 +4114,18 @@
         <Parameter Name="op" Type="Java.Util.Functions.IBinaryOperator" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the array</param>
         <param name="array">the array</param>
         <param name="fromIndex">the index of the first element, inclusive</param>
         <param name="toIndex">the index of the last element, exclusive</param>
         <param name="op">a side-effect-free, associative function to perform the
             cumulation</param>
-        <summary>Performs <c>#parallelPrefix(double[], DoubleBinaryOperator)</c>
+        <summary>Performs <c>#parallelPrefix(Object[], BinaryOperator)</c>
             for the given subrange of the array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20int,%20int,%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], int, int, java.util.function.DoubleBinaryOperator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(java.lang.Object[],%20int,%20int,%20java.util.function.BinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(java.lang.Object[], int, int, java.util.function.BinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -4155,12 +4214,12 @@
         <param name="toIndex">the index of the last element, exclusive</param>
         <param name="op">a side-effect-free, associative function to perform the
             cumulation</param>
-        <summary>Performs <c>#parallelPrefix(double[], DoubleBinaryOperator)</c>
+        <summary>Performs <c>#parallelPrefix(int[], IntBinaryOperator)</c>
             for the given subrange of the array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20int,%20int,%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], int, int, java.util.function.DoubleBinaryOperator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(int[],%20int,%20int,%20java.util.function.IntBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(int[], int, int, java.util.function.IntBinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -4202,12 +4261,12 @@
         <param name="toIndex">the index of the last element, exclusive</param>
         <param name="op">a side-effect-free, associative function to perform the
             cumulation</param>
-        <summary>Performs <c>#parallelPrefix(double[], DoubleBinaryOperator)</c>
+        <summary>Performs <c>#parallelPrefix(long[], LongBinaryOperator)</c>
             for the given subrange of the array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(double[],%20int,%20int,%20java.util.function.DoubleBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(double[], int, int, java.util.function.DoubleBinaryOperator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelPrefix(long[],%20int,%20int,%20java.util.function.LongBinaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelPrefix(long[], int, int, java.util.function.LongBinaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -4246,6 +4305,7 @@
         <Parameter Name="generator" Type="Java.Util.Functions.IIntFunction" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">type of elements of the array</param>
         <param name="array">array to be initialized</param>
         <param name="generator">a function accepting an index and producing the desired
                    value for that position</param>
@@ -4254,7 +4314,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSetAll(double[],%20java.util.function.IntToDoubleFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSetAll(double[], java.util.function.IntToDoubleFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSetAll(java.lang.Object[],%20java.util.function.IntFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSetAll(java.lang.Object[], java.util.function.IntFunction)</code>.</a>
             </format>
           </para>
           <para>
@@ -4334,13 +4394,13 @@
       <Docs>
         <param name="array">array to be initialized</param>
         <param name="generator">a function accepting an index and producing the desired
-                   value for that position</param>
+            value for that position</param>
         <summary>Set all elements of the specified array, in parallel, using the
             provided generator function to compute each element.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSetAll(double[],%20java.util.function.IntToDoubleFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSetAll(double[], java.util.function.IntToDoubleFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSetAll(int[],%20java.util.function.IntUnaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSetAll(int[], java.util.function.IntUnaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -4383,7 +4443,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSetAll(double[],%20java.util.function.IntToDoubleFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSetAll(double[], java.util.function.IntToDoubleFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSetAll(long[],%20java.util.function.IntToLongFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSetAll(long[], java.util.function.IntToLongFunction)</code>.</a>
             </format>
           </para>
           <para>
@@ -4421,12 +4481,14 @@
         <Parameter Name="a" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects to be sorted</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <summary>Sorts the specified array of objects into ascending order, according
+            to the Comparable natural ordering of its elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(java.lang.Comparable[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(java.lang.Comparable[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4504,7 +4566,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(char[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4543,7 +4605,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(double[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4582,7 +4644,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(short[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4621,7 +4683,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(int[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4660,7 +4722,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(long[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4699,7 +4761,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(float[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -4738,13 +4800,17 @@
         <Parameter Name="cmp" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="cmp">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects to be sorted</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="cmp">the comparator to determine the order of the array.  A
+                   <c>null</c> value indicates that the elements'
+                   Comparable natural ordering should be used.</param>
+        <summary>Sorts the specified array of objects according to the order induced by
+            the specified comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(java.lang.Object[],%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(java.lang.Object[], java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -4784,14 +4850,19 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects to be sorted</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   sorted</param>
+        <param name="toIndex">the index of the last element (exclusive) to be sorted</param>
+        <summary>Sorts the specified range of the specified array of objects into
+            ascending order, according to the
+            Comparable natural ordering of its
+            elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(java.lang.Comparable[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(java.lang.Comparable[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4827,14 +4898,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending numerical order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4870,14 +4941,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending numerical order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4913,14 +4984,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending numerical order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(double[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(double[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4956,14 +5027,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending numerical order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -4999,14 +5070,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending numerical order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5042,14 +5113,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending numerical order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(long[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(long[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5085,14 +5156,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending numerical order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5133,15 +5204,20 @@
         <Parameter Name="cmp" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="cmp">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects to be sorted</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   sorted</param>
+        <param name="toIndex">the index of the last element (exclusive) to be sorted</param>
+        <param name="cmp">the comparator to determine the order of the array.  A
+                   <c>null</c> value indicates that the elements'
+                   Comparable natural ordering should be used.</param>
+        <summary>Sorts the specified range of the specified array of objects according
+            to the order induced by the specified comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#parallelSort(java.lang.Object[],%20int,%20int,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.parallelSort(java.lang.Object[], int, int, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -5180,6 +5256,7 @@
         <Parameter Name="generator" Type="Java.Util.Functions.IIntFunction" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">type of elements of the array</param>
         <param name="array">array to be initialized</param>
         <param name="generator">a function accepting an index and producing the desired
                    value for that position</param>
@@ -5188,7 +5265,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#setAll(double[],%20java.util.function.IntToDoubleFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.setAll(double[], java.util.function.IntToDoubleFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#setAll(java.lang.Object[],%20java.util.function.IntFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.setAll(java.lang.Object[], java.util.function.IntFunction)</code>.</a>
             </format>
           </para>
           <para>
@@ -5274,7 +5351,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#setAll(double[],%20java.util.function.IntToDoubleFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.setAll(double[], java.util.function.IntToDoubleFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#setAll(int[],%20java.util.function.IntUnaryOperator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.setAll(int[], java.util.function.IntUnaryOperator)</code>.</a>
             </format>
           </para>
           <para>
@@ -5317,7 +5394,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#setAll(double[],%20java.util.function.IntToDoubleFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.setAll(double[], java.util.function.IntToDoubleFunction)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#setAll(long[],%20java.util.function.IntToLongFunction)" title="Reference documentation">Java documentation for <code>java.util.Arrays.setAll(long[], java.util.function.IntToLongFunction)</code>.</a>
             </format>
           </para>
           <para>
@@ -5352,11 +5429,12 @@
       </Parameters>
       <Docs>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <summary>Sorts the specified array of objects into ascending order, according
+            to the Comparable natural ordering of its elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5439,7 +5517,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(char[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5479,7 +5557,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(double[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5520,7 +5598,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(short[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5560,7 +5638,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(int[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5600,7 +5678,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(long[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5640,7 +5718,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(float[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(float[])</code>.</a>
             </format>
           </para>
           <para>
@@ -5681,13 +5759,17 @@
         <Parameter Name="c" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects to be sorted</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="c">the comparator to determine the order of the array.  A
+                   <c>null</c> value indicates that the elements'
+                   Comparable natural ordering should be used.</param>
+        <summary>Sorts the specified array of objects according to the order induced by
+            the specified comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(java.lang.Object[],%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(java.lang.Object[], java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -5723,14 +5805,18 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   sorted</param>
+        <param name="toIndex">the index of the last element (exclusive) to be sorted</param>
+        <summary>Sorts the specified range of the specified array of objects into
+            ascending order, according to the
+            Comparable natural ordering of its
+            elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(java.lang.Object[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(java.lang.Object[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5772,14 +5858,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5819,14 +5905,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5866,14 +5952,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(double[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(double[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5913,14 +5999,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(short[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(short[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -5960,14 +6046,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(int[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(int[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6007,14 +6093,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(long[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(long[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6054,14 +6140,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element, inclusive, to be sorted</param>
+        <param name="toIndex">the index of the last element, exclusive, to be sorted</param>
+        <summary>Sorts the specified range of the array into ascending order.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(float[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(float[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6106,15 +6192,20 @@
         <Parameter Name="c" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="c">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the class of the objects to be sorted</param>
         <param name="a">the array to be sorted</param>
-        <summary>Sorts the specified array into ascending numerical order.</summary>
+        <param name="fromIndex">the index of the first element (inclusive) to be
+                   sorted</param>
+        <param name="toIndex">the index of the last element (exclusive) to be sorted</param>
+        <param name="c">the comparator to determine the order of the array.  A
+                   <c>null</c> value indicates that the elements'
+                   Comparable natural ordering should be used.</param>
+        <summary>Sorts the specified range of the specified array of objects according
+            to the order induced by the specified comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#sort(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#sort(java.lang.Object[],%20int,%20int,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Arrays.sort(java.lang.Object[], int, int, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -6152,14 +6243,14 @@
         <Parameter Name="array" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">type of elements</param>
         <param name="array">the array, assumed to be unmodified during use</param>
-        <summary>Returns a <c>Spliterator.OfDouble</c> covering all of the specified
-            array.</summary>
+        <summary>Returns a <c>Spliterator</c> covering all of the specified array.</summary>
         <returns>a spliterator for the array elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#spliterator(double[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.spliterator(double[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#spliterator(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.spliterator(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6199,16 +6290,17 @@
         <Parameter Name="endExclusive" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="startInclusive">To be added.</param>
-        <param name="endExclusive">To be added.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">type of elements</param>
         <param name="array">the array, assumed to be unmodified during use</param>
-        <summary>Returns a <c>Spliterator.OfDouble</c> covering all of the specified
-            array.</summary>
+        <param name="startInclusive">the first index to cover, inclusive</param>
+        <param name="endExclusive">index immediately past the last index to cover</param>
+        <summary>Returns a <c>Spliterator</c> covering the specified range of the
+            specified array.</summary>
         <returns>a spliterator for the array elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#spliterator(double[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.spliterator(double[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#spliterator(java.lang.Object[],%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Arrays.spliterator(java.lang.Object[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -6310,7 +6402,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6351,7 +6443,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(boolean[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(boolean[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6433,7 +6525,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(char[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(char[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6474,7 +6566,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(double[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(double[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6515,7 +6607,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(short[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(short[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6556,7 +6648,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(int[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(int[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6597,7 +6689,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(long[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(long[])</code>.</a>
             </format>
           </para>
           <para>
@@ -6638,7 +6730,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Arrays#toString(byte[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Arrays#toString(float[])" title="Reference documentation">Java documentation for <code>java.util.Arrays.toString(float[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/BitSet.xml b/docs/Mono.Android/en/Java.Util/BitSet.xml
index 461b04db40..19dd15e9a0 100644
--- a/docs/Mono.Android/en/Java.Util/BitSet.xml
+++ b/docs/Mono.Android/en/Java.Util/BitSet.xml
@@ -103,12 +103,14 @@
         <Parameter Name="nbits" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="nbits">To be added.</param>
-        <summary>Creates a new bit set.</summary>
+        <param name="nbits">the initial size of the bit set</param>
+        <summary>Creates a bit set whose initial size is large enough to explicitly
+            represent bits with indices in the range <c>0</c> through
+            <c>nbits-1</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#BitSet()" title="Reference documentation">Java documentation for <code>java.util.BitSet.BitSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#BitSet(int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.BitSet(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -326,12 +328,12 @@
         <Parameter Name="bitIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="bitIndex">To be added.</param>
-        <summary>Sets all of the bits in this BitSet to <c>false</c>.</summary>
+        <param name="bitIndex">the index of the bit to be cleared</param>
+        <summary>Sets the bit specified by the index to <c>false</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#clear()" title="Reference documentation">Java documentation for <code>java.util.BitSet.clear()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#clear(int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.clear(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -369,13 +371,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <summary>Sets all of the bits in this BitSet to <c>false</c>.</summary>
+        <param name="fromIndex">index of the first bit to be cleared</param>
+        <param name="toIndex">index after the last bit to be cleared</param>
+        <summary>Sets the bits from the specified <c>fromIndex</c> (inclusive) to the
+            specified <c>toIndex</c> (exclusive) to <c>false</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#clear()" title="Reference documentation">Java documentation for <code>java.util.BitSet.clear()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#clear(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.clear(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -496,15 +499,15 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="bitIndex">the index of the bit to flip</param>
-        <summary>Sets the bit at the specified index to the complement of its
-            current value.</summary>
+        <param name="fromIndex">index of the first bit to flip</param>
+        <param name="toIndex">index after the last bit to flip</param>
+        <summary>Sets each bit from the specified <c>fromIndex</c> (inclusive) to the
+            specified <c>toIndex</c> (exclusive) to the complement of its current
+            value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#flip(int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.flip(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#flip(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.flip(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -586,15 +589,15 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="bitIndex">the bit index</param>
-        <summary>Returns the value of the bit with the specified index.</summary>
-        <returns>the value of the bit with the specified index</returns>
+        <param name="fromIndex">index of the first bit to include</param>
+        <param name="toIndex">index after the last bit to include</param>
+        <summary>Returns a new <c>BitSet</c> composed of bits from this <c>BitSet</c>
+            from <c>fromIndex</c> (inclusive) to <c>toIndex</c> (exclusive).</summary>
+        <returns>a new <c>BitSet</c> from a range of this <c>BitSet</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#get(int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.get(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#get(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.get(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1047,13 +1050,13 @@
         <Parameter Name="value" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
         <param name="bitIndex">a bit index</param>
-        <summary>Sets the bit at the specified index to <c>true</c>.</summary>
+        <param name="value">a boolean value to set</param>
+        <summary>Sets the bit at the specified index to the specified value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#set(int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.set(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#set(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.BitSet.set(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1091,14 +1094,14 @@
         <Parameter Name="toIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="bitIndex">a bit index</param>
-        <summary>Sets the bit at the specified index to <c>true</c>.</summary>
+        <param name="fromIndex">index of the first bit to be set</param>
+        <param name="toIndex">index after the last bit to be set</param>
+        <summary>Sets the bits from the specified <c>fromIndex</c> (inclusive) to the
+            specified <c>toIndex</c> (exclusive) to <c>true</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#set(int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.set(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#set(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.set(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1138,15 +1141,15 @@
         <Parameter Name="value" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="value">To be added.</param>
-        <param name="bitIndex">a bit index</param>
-        <summary>Sets the bit at the specified index to <c>true</c>.</summary>
+        <param name="fromIndex">index of the first bit to be set</param>
+        <param name="toIndex">index after the last bit to be set</param>
+        <param name="value">value to set the selected bits to</param>
+        <summary>Sets the bits from the specified <c>fromIndex</c> (inclusive) to the
+            specified <c>toIndex</c> (exclusive) to the specified value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#set(int)" title="Reference documentation">Java documentation for <code>java.util.BitSet.set(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#set(int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.BitSet.set(int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1405,18 +1408,17 @@
         <Parameter Name="lb" Type="Java.Nio.LongBuffer" />
       </Parameters>
       <Docs>
-        <param name="lb">To be added.</param>
-        <param name="bb">a byte buffer containing a little-endian representation
+        <param name="lb">a long buffer containing a little-endian representation
                    of a sequence of bits between its position and limit, to be
                    used as the initial bits of the new bit set</param>
-        <summary>Returns a new bit set containing all the bits in the given byte
+        <summary>Returns a new bit set containing all the bits in the given long
             buffer between its position and limit.</summary>
         <returns>a <c>BitSet</c> containing all the bits in the buffer in the
                     specified range</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#valueOf(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.util.BitSet.valueOf(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#valueOf(java.nio.LongBuffer)" title="Reference documentation">Java documentation for <code>java.util.BitSet.valueOf(java.nio.LongBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1450,18 +1452,15 @@
         <Parameter Name="bytes" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="bytes">To be added.</param>
-        <param name="bb">a byte buffer containing a little-endian representation
-                   of a sequence of bits between its position and limit, to be
-                   used as the initial bits of the new bit set</param>
-        <summary>Returns a new bit set containing all the bits in the given byte
-            buffer between its position and limit.</summary>
-        <returns>a <c>BitSet</c> containing all the bits in the buffer in the
-                    specified range</returns>
+        <param name="bytes">a byte array containing a little-endian
+                   representation of a sequence of bits to be used as the
+                   initial bits of the new bit set</param>
+        <summary>Returns a new bit set containing all the bits in the given byte array.</summary>
+        <returns>a <c>BitSet</c> containing all the bits in the byte array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#valueOf(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.util.BitSet.valueOf(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#valueOf(byte[])" title="Reference documentation">Java documentation for <code>java.util.BitSet.valueOf(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1495,18 +1494,15 @@
         <Parameter Name="longs" Type="System.Int64[]" />
       </Parameters>
       <Docs>
-        <param name="longs">To be added.</param>
-        <param name="bb">a byte buffer containing a little-endian representation
-                   of a sequence of bits between its position and limit, to be
-                   used as the initial bits of the new bit set</param>
-        <summary>Returns a new bit set containing all the bits in the given byte
-            buffer between its position and limit.</summary>
-        <returns>a <c>BitSet</c> containing all the bits in the buffer in the
-                    specified range</returns>
+        <param name="longs">a long array containing a little-endian representation
+                   of a sequence of bits to be used as the initial bits of the
+                   new bit set</param>
+        <summary>Returns a new bit set containing all the bits in the given long array.</summary>
+        <returns>a <c>BitSet</c> containing all the bits in the long array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/BitSet#valueOf(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>java.util.BitSet.valueOf(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/BitSet#valueOf(long[])" title="Reference documentation">Java documentation for <code>java.util.BitSet.valueOf(long[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Calendar.xml b/docs/Mono.Android/en/Java.Util/Calendar.xml
index 696416277c..82197b571f 100644
--- a/docs/Mono.Android/en/Java.Util/Calendar.xml
+++ b/docs/Mono.Android/en/Java.Util/Calendar.xml
@@ -113,15 +113,13 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="zone">To be added.</param>
-        <param name="aLocale">To be added.</param>
-        <summary>Constructs a Calendar with the default time zone
-            and the default <c>java.util.Locale.Category#FORMAT FORMAT</c>
-            locale.</summary>
+        <param name="zone">the time zone to use</param>
+        <param name="aLocale">the locale for the week data</param>
+        <summary>Constructs a calendar with the specified time zone and locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#Calendar()" title="Reference documentation">Java documentation for <code>java.util.Calendar.Calendar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#Calendar(java.util.TimeZone,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Calendar.Calendar(java.util.TimeZone, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -676,14 +674,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="field">To be added.</param>
-        <summary>Sets all the calendar field values and the time value
+        <param name="field">the calendar field to be cleared.</param>
+        <summary>Sets the given calendar field value and the time value
             (millisecond offset from the &lt;a href="#Epoch"&gt;Epoch&lt;/a&gt;) of
             this &lt;code&gt;Calendar&lt;/code&gt; undefined.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#clear()" title="Reference documentation">Java documentation for <code>java.util.Calendar.clear()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#clear(int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.clear(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1817,13 +1815,13 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="aLocale">To be added.</param>
-        <summary>Gets a calendar using the default time zone and locale.</summary>
+        <param name="aLocale">the locale for the week data</param>
+        <summary>Gets a calendar using the default time zone and specified locale.</summary>
         <returns>a Calendar.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#getInstance()" title="Reference documentation">Java documentation for <code>java.util.Calendar.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Calendar.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -1858,13 +1856,13 @@
         <Parameter Name="zone" Type="Java.Util.TimeZone" />
       </Parameters>
       <Docs>
-        <param name="zone">To be added.</param>
-        <summary>Gets a calendar using the default time zone and locale.</summary>
+        <param name="zone">the time zone to use</param>
+        <summary>Gets a calendar using the specified time zone and default locale.</summary>
         <returns>a Calendar.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#getInstance()" title="Reference documentation">Java documentation for <code>java.util.Calendar.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#getInstance(java.util.TimeZone)" title="Reference documentation">Java documentation for <code>java.util.Calendar.getInstance(java.util.TimeZone)</code>.</a>
             </format>
           </para>
           <para>
@@ -1900,14 +1898,14 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="zone">To be added.</param>
-        <param name="aLocale">To be added.</param>
-        <summary>Gets a calendar using the default time zone and locale.</summary>
+        <param name="zone">the time zone to use</param>
+        <param name="aLocale">the locale for the week data</param>
+        <summary>Gets a calendar with the specified time zone and locale.</summary>
         <returns>a Calendar.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#getInstance()" title="Reference documentation">Java documentation for <code>java.util.Calendar.getInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#getInstance(java.util.TimeZone,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Calendar.getInstance(java.util.TimeZone, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -3221,15 +3219,15 @@
         <Parameter Name="up" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="up">To be added.</param>
-        <param name="field">the calendar field.</param>
-        <param name="amount">the signed amount to add to the calendar &lt;code&gt;field&lt;/code&gt;.</param>
-        <summary>Adds the specified (signed) amount to the specified calendar field
-            without changing larger fields.</summary>
+        <param name="field">the time field.</param>
+        <param name="up">indicates if the value of the specified time field is to be
+            rolled up or rolled down. Use true if rolling up, false otherwise.</param>
+        <summary>Adds or subtracts (up/down) a single unit of time on the given time
+            field without changing larger fields.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#roll(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.roll(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#roll(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.Calendar.roll(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -3483,16 +3481,16 @@
         <Parameter Name="date" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="date">To be added.</param>
-        <param name="field">the given calendar field.</param>
-        <param name="value">the value to be set for the given calendar field.</param>
-        <summary>Sets the given calendar field to the given value.</summary>
+        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field.</param>
+        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field.
+            Month value is 0-based. e.g., 0 for January.</param>
+        <param name="date">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field.</param>
+        <summary>Sets the values for the calendar fields &lt;code&gt;YEAR&lt;/code&gt;,
+            &lt;code&gt;MONTH&lt;/code&gt;, and &lt;code&gt;DAY_OF_MONTH&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#set(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.set(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#set(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.set(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3531,18 +3529,19 @@
         <Parameter Name="minute" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="date">To be added.</param>
-        <param name="hourOfDay">To be added.</param>
-        <param name="minute">To be added.</param>
-        <param name="field">the given calendar field.</param>
-        <param name="value">the value to be set for the given calendar field.</param>
-        <summary>Sets the given calendar field to the given value.</summary>
+        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field.</param>
+        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field.
+            Month value is 0-based. e.g., 0 for January.</param>
+        <param name="date">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field.</param>
+        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field.</param>
+        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field.</param>
+        <summary>Sets the values for the calendar fields &lt;code&gt;YEAR&lt;/code&gt;,
+            &lt;code&gt;MONTH&lt;/code&gt;, &lt;code&gt;DAY_OF_MONTH&lt;/code&gt;,
+            &lt;code&gt;HOUR_OF_DAY&lt;/code&gt;, and &lt;code&gt;MINUTE&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#set(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.set(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#set(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.set(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3582,19 +3581,20 @@
         <Parameter Name="second" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="date">To be added.</param>
-        <param name="hourOfDay">To be added.</param>
-        <param name="minute">To be added.</param>
-        <param name="second">To be added.</param>
-        <param name="field">the given calendar field.</param>
-        <param name="value">the value to be set for the given calendar field.</param>
-        <summary>Sets the given calendar field to the given value.</summary>
+        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field.</param>
+        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field.
+            Month value is 0-based. e.g., 0 for January.</param>
+        <param name="date">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field.</param>
+        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field.</param>
+        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field.</param>
+        <param name="second">the value used to set the &lt;code&gt;SECOND&lt;/code&gt; calendar field.</param>
+        <summary>Sets the values for the fields &lt;code&gt;YEAR&lt;/code&gt;, &lt;code&gt;MONTH&lt;/code&gt;,
+            &lt;code&gt;DAY_OF_MONTH&lt;/code&gt;, &lt;code&gt;HOUR_OF_DAY&lt;/code&gt;, &lt;code&gt;MINUTE&lt;/code&gt;, and
+            &lt;code&gt;SECOND&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Calendar#set(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.set(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Calendar#set(int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Calendar.set(int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Collections.xml b/docs/Mono.Android/en/Java.Util/Collections.xml
index ba9a8c9254..9fe53b37c9 100644
--- a/docs/Mono.Android/en/Java.Util/Collections.xml
+++ b/docs/Mono.Android/en/Java.Util/Collections.xml
@@ -102,7 +102,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collections#addAll(java.util.Collection,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Collections.addAll(java.util.Collection, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collections#addAll(java.util.Collection,%20java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Collections.addAll(java.util.Collection, java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -243,10 +243,12 @@
         <Parameter Name="c" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the list</param>
         <param name="list">the list to be searched.</param>
         <param name="key">the key to be searched for.</param>
+        <param name="c">the comparator by which the list is ordered.
+                    A <c>null</c> value indicates that the elements'
+                    Comparable natural ordering should be used.</param>
         <summary>Searches the specified list for the specified object using the binary
             search algorithm.</summary>
         <returns>the index of the search key, if it is contained in the list;
@@ -260,7 +262,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collections#binarySearch(java.util.List,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Collections.binarySearch(java.util.List, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collections#binarySearch(java.util.List,%20java.lang.Object,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Collections.binarySearch(java.util.List, java.lang.Object, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -1614,17 +1616,19 @@
         <Parameter Name="comp" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="comp">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the collection</param>
         <param name="coll">the collection whose maximum element is to be determined.</param>
+        <param name="comp">the comparator with which to determine the maximum element.
+                    A <c>null</c> value indicates that the elements' <i>natural
+                   ordering</i> should be used.</param>
         <summary>Returns the maximum element of the given collection, according to the
-            <i>natural ordering</i> of its elements.</summary>
+            order induced by the specified comparator.</summary>
         <returns>the maximum element of the given collection, according
-                    to the <i>natural ordering</i> of its elements.</returns>
+                    to the specified comparator.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collections#max(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.Collections.max(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collections#max(java.util.Collection,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Collections.max(java.util.Collection, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -1710,17 +1714,19 @@
         <Parameter Name="comp" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="comp">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the collection</param>
         <param name="coll">the collection whose minimum element is to be determined.</param>
+        <param name="comp">the comparator with which to determine the minimum element.
+                    A <c>null</c> value indicates that the elements' <i>natural
+                    ordering</i> should be used.</param>
         <summary>Returns the minimum element of the given collection, according to the
-            <i>natural ordering</i> of its elements.</summary>
+            order induced by the specified comparator.</summary>
         <returns>the minimum element of the given collection, according
-                    to the <i>natural ordering</i> of its elements.</returns>
+                    to the specified comparator.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collections#min(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.Collections.min(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collections#min(java.util.Collection,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Collections.min(java.util.Collection, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -1993,18 +1999,17 @@
         <Parameter Name="cmp" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="cmp">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the class of the objects compared by the comparator</param>
-        <summary>Returns a comparator that imposes the reverse of the &lt;em&gt;natural
-            ordering&lt;/em&gt; on a collection of objects that implement the
-            <c>Comparable</c> interface.</summary>
-        <returns>A comparator that imposes the reverse of the <i>natural
-                    ordering</i> on a collection of objects that implement
-                    the <c>Comparable</c> interface.</returns>
+        <param name="cmp">a comparator who's ordering is to be reversed by the returned
+            comparator or <c>null</c></param>
+        <summary>Returns a comparator that imposes the reverse ordering of the specified
+            comparator.</summary>
+        <returns>A comparator that imposes the reverse ordering of the
+                    specified comparator.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collections#reverseOrder()" title="Reference documentation">Java documentation for <code>java.util.Collections.reverseOrder()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collections#reverseOrder(java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Collections.reverseOrder(java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -2122,14 +2127,14 @@
         <Parameter Name="rnd" Type="Java.Util.Random" />
       </Parameters>
       <Docs>
-        <param name="rnd">To be added.</param>
         <param name="list">the list to be shuffled.</param>
-        <summary>Randomly permutes the specified list using a default source of
+        <param name="rnd">the source of randomness to use to shuffle the list.</param>
+        <summary>Randomly permute the specified list using the specified source of
             randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collections#shuffle(java.util.List)" title="Reference documentation">Java documentation for <code>java.util.Collections.shuffle(java.util.List)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collections#shuffle(java.util.List,%20java.util.Random)" title="Reference documentation">Java documentation for <code>java.util.Collections.shuffle(java.util.List, java.util.Random)</code>.</a>
             </format>
           </para>
           <para>
@@ -2353,15 +2358,17 @@
         <Parameter Name="c" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the class of the objects in the list</param>
         <param name="list">the list to be sorted.</param>
-        <summary>Sorts the specified list into ascending order, according to the
-            Comparable natural ordering of its elements.</summary>
+        <param name="c">the comparator to determine the order of the list.  A
+                   <c>null</c> value indicates that the elements' <i>natural
+                   ordering</i> should be used.</param>
+        <summary>Sorts the specified list according to the order induced by the
+            specified comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collections#sort(java.util.List)" title="Reference documentation">Java documentation for <code>java.util.Collections.sort(java.util.List)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collections#sort(java.util.List,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Collections.sort(java.util.List, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Comparator.xml b/docs/Mono.Android/en/Java.Util/Comparator.xml
index 9fe0bdd367..e04ceff5fc 100644
--- a/docs/Mono.Android/en/Java.Util/Comparator.xml
+++ b/docs/Mono.Android/en/Java.Util/Comparator.xml
@@ -116,17 +116,19 @@
         <Parameter Name="keyComparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="keyComparator">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of element to be compared</param>
-        <param name="&lt;U&gt;&lt;U&gt;">the type of the <c>Comparable</c> sort key</param>
-        <param name="keyExtractor">the function used to extract the <c>Comparable</c> sort key</param>
-        <summary>Accepts a function that extracts a <c>java.lang.Comparable
-            Comparable</c> sort key from a type <c>T</c>, and returns a <c>Comparator&lt;T&gt;</c> that compares by that sort key.</summary>
-        <returns>a comparator that compares by an extracted key</returns>
+        <param name="&lt;U&gt;&lt;U&gt;">the type of the sort key</param>
+        <param name="keyExtractor">the function used to extract the sort key</param>
+        <param name="keyComparator">the <c>Comparator</c> used to compare the sort key</param>
+        <summary>Accepts a function that extracts a sort key from a type <c>T</c>, and
+            returns a <c>Comparator&lt;T&gt;</c> that compares by that sort key using
+            the specified <c>Comparator</c>.</summary>
+        <returns>a comparator that compares by an extracted key using the
+                    specified <c>Comparator</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Comparator#comparing(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.Comparator.comparing(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Comparator#comparing(java.util.function.Function,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Comparator.comparing(java.util.function.Function, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ConcurrentModificationException.xml b/docs/Mono.Android/en/Java.Util/ConcurrentModificationException.xml
index 74b771471c..4d858a3192 100644
--- a/docs/Mono.Android/en/Java.Util/ConcurrentModificationException.xml
+++ b/docs/Mono.Android/en/Java.Util/ConcurrentModificationException.xml
@@ -89,13 +89,17 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a ConcurrentModificationException with no
-            detail message.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value is
+                    permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified cause and a detail
+            message of <c>(cause==null ? null : cause.toString())</c> (which
+            typically contains the class and detail message of <c>cause</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ConcurrentModificationException#ConcurrentModificationException()" title="Reference documentation">Java documentation for <code>java.util.ConcurrentModificationException.ConcurrentModificationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ConcurrentModificationException#ConcurrentModificationException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.ConcurrentModificationException.ConcurrentModificationException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +130,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a ConcurrentModificationException with no
-            detail message.</summary>
+        <param name="message">the detail message pertaining to this exception.</param>
+        <summary>Constructs a <c>ConcurrentModificationException</c> with the
+            specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ConcurrentModificationException#ConcurrentModificationException()" title="Reference documentation">Java documentation for <code>java.util.ConcurrentModificationException.ConcurrentModificationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ConcurrentModificationException#ConcurrentModificationException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.ConcurrentModificationException.ConcurrentModificationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,14 +192,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <summary>Constructs a ConcurrentModificationException with no
-            detail message.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                    by the <c>Throwable#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).  (A <c>null</c> value
+                    is permitted, and indicates that the cause is nonexistent or
+                    unknown.)</param>
+        <summary>Constructs a new exception with the specified detail message and
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ConcurrentModificationException#ConcurrentModificationException()" title="Reference documentation">Java documentation for <code>java.util.ConcurrentModificationException.ConcurrentModificationException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ConcurrentModificationException#ConcurrentModificationException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.ConcurrentModificationException.ConcurrentModificationException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Currency.xml b/docs/Mono.Android/en/Java.Util/Currency.xml
index a4bf6211ec..21e2f8e05e 100644
--- a/docs/Mono.Android/en/Java.Util/Currency.xml
+++ b/docs/Mono.Android/en/Java.Util/Currency.xml
@@ -219,15 +219,15 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
+        <param name="locale">the locale for which a display name for this currency is
+            needed</param>
         <summary>Gets the name that is suitable for displaying this currency for
-            the default <c>Locale.Category#DISPLAY DISPLAY</c> locale.</summary>
-        <returns>the display name of this currency for the default
-                <c>Locale.Category#DISPLAY DISPLAY</c> locale</returns>
+            the specified locale.</summary>
+        <returns>the display name of this currency for the specified locale</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Currency#getDisplayName()" title="Reference documentation">Java documentation for <code>java.util.Currency.getDisplayName()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Currency#getDisplayName(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Currency.getDisplayName(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -261,14 +261,16 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
-        <param name="currencyCode">the ISO 4217 code of the currency</param>
-        <summary>Returns the &lt;code&gt;Currency&lt;/code&gt; instance for the given currency code.</summary>
-        <returns>the &lt;code&gt;Currency&lt;/code&gt; instance for the given currency code</returns>
+        <param name="locale">the locale for whose country a &lt;code&gt;Currency&lt;/code&gt;
+            instance is needed</param>
+        <summary>Returns the &lt;code&gt;Currency&lt;/code&gt; instance for the country of the
+            given locale.</summary>
+        <returns>the &lt;code&gt;Currency&lt;/code&gt; instance for the country of the given
+            locale, or <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Currency#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Currency.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Currency#getInstance(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Currency.getInstance(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -348,15 +350,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
-        <summary>Gets the symbol of this currency for the default
-            <c>Locale.Category#DISPLAY DISPLAY</c> locale.</summary>
-        <returns>the symbol of this currency for the default
-                <c>Locale.Category#DISPLAY DISPLAY</c> locale</returns>
+        <param name="locale">the locale for which a display name for this currency is
+            needed</param>
+        <summary>Gets the symbol of this currency for the specified locale.</summary>
+        <returns>the symbol of this currency for the specified locale</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Currency#getSymbol()" title="Reference documentation">Java documentation for <code>java.util.Currency.getSymbol()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Currency#getSymbol(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Currency.getSymbol(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Date.xml b/docs/Mono.Android/en/Java.Util/Date.xml
index a4ad934768..c9d33aa58c 100644
--- a/docs/Mono.Android/en/Java.Util/Date.xml
+++ b/docs/Mono.Android/en/Java.Util/Date.xml
@@ -109,14 +109,15 @@
         <Parameter Name="date" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="date">To be added.</param>
-        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
-            it represents the time at which it was allocated, measured to the
-            nearest millisecond.</summary>
+        <param name="date">the milliseconds since January 1, 1970, 00:00:00 GMT.</param>
+        <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it to
+            represent the specified number of milliseconds since the
+            standard base time known as "the epoch", namely January 1,
+            1970, 00:00:00 GMT.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Date#Date()" title="Reference documentation">Java documentation for <code>java.util.Date.Date()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Date#Date(long)" title="Reference documentation">Java documentation for <code>java.util.Date.Date(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -152,14 +153,15 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
+        <param name="s">a string representation of the date.</param>
         <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
-            it represents the time at which it was allocated, measured to the
-            nearest millisecond.</summary>
+            it represents the date and time indicated by the string
+            &lt;code&gt;s&lt;/code&gt;, which is interpreted as if by the
+            <c>Date#parse</c> method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Date#Date()" title="Reference documentation">Java documentation for <code>java.util.Date.Date()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Date#Date(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Date.Date(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -220,16 +222,17 @@
         <Parameter Name="date" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="date">To be added.</param>
+        <param name="year">the year minus 1900.</param>
+        <param name="month">the month between 0-11.</param>
+        <param name="date">the day of the month between 1-31.</param>
         <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
-            it represents the time at which it was allocated, measured to the
-            nearest millisecond.</summary>
+            it represents midnight, local time, at the beginning of the day
+            specified by the &lt;code&gt;year&lt;/code&gt;, &lt;code&gt;month&lt;/code&gt;, and
+            &lt;code&gt;date&lt;/code&gt; arguments.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Date#Date()" title="Reference documentation">Java documentation for <code>java.util.Date.Date()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Date#Date(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Date.Date(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -269,18 +272,20 @@
         <Parameter Name="min" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="date">To be added.</param>
-        <param name="hrs">To be added.</param>
-        <param name="min">To be added.</param>
+        <param name="year">the year minus 1900.</param>
+        <param name="month">the month between 0-11.</param>
+        <param name="date">the day of the month between 1-31.</param>
+        <param name="hrs">the hours between 0-23.</param>
+        <param name="min">the minutes between 0-59.</param>
         <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
-            it represents the time at which it was allocated, measured to the
-            nearest millisecond.</summary>
+            it represents the instant at the start of the minute specified by
+            the &lt;code&gt;year&lt;/code&gt;, &lt;code&gt;month&lt;/code&gt;, &lt;code&gt;date&lt;/code&gt;,
+            &lt;code&gt;hrs&lt;/code&gt;, and &lt;code&gt;min&lt;/code&gt; arguments, in the local
+            time zone.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Date#Date()" title="Reference documentation">Java documentation for <code>java.util.Date.Date()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Date#Date(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Date.Date(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -321,19 +326,21 @@
         <Parameter Name="sec" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="date">To be added.</param>
-        <param name="hrs">To be added.</param>
-        <param name="min">To be added.</param>
-        <param name="sec">To be added.</param>
+        <param name="year">the year minus 1900.</param>
+        <param name="month">the month between 0-11.</param>
+        <param name="date">the day of the month between 1-31.</param>
+        <param name="hrs">the hours between 0-23.</param>
+        <param name="min">the minutes between 0-59.</param>
+        <param name="sec">the seconds between 0-59.</param>
         <summary>Allocates a &lt;code&gt;Date&lt;/code&gt; object and initializes it so that
-            it represents the time at which it was allocated, measured to the
-            nearest millisecond.</summary>
+            it represents the instant at the start of the second specified
+            by the &lt;code&gt;year&lt;/code&gt;, &lt;code&gt;month&lt;/code&gt;, &lt;code&gt;date&lt;/code&gt;,
+            &lt;code&gt;hrs&lt;/code&gt;, &lt;code&gt;min&lt;/code&gt;, and &lt;code&gt;sec&lt;/code&gt; arguments,
+            in the local time zone.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Date#Date()" title="Reference documentation">Java documentation for <code>java.util.Date.Date()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Date#Date(int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Date.Date(int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/EnumMap.xml b/docs/Mono.Android/en/Java.Util/EnumMap.xml
index 4df415dc9f..7f42544880 100644
--- a/docs/Mono.Android/en/Java.Util/EnumMap.xml
+++ b/docs/Mono.Android/en/Java.Util/EnumMap.xml
@@ -113,13 +113,13 @@
         <Parameter Name="m" Type="Java.Util.EnumMap" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <param name="keyType">the class object of the key type for this enum map</param>
-        <summary>Creates an empty enum map with the specified key type.</summary>
+        <param name="m">the enum map from which to initialize this enum map</param>
+        <summary>Creates an enum map with the same key type as the specified enum
+            map, initially containing the same mappings (if any).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumMap#EnumMap(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.util.EnumMap.EnumMap(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumMap#EnumMap(java.util.EnumMap)" title="Reference documentation">Java documentation for <code>java.util.EnumMap.EnumMap(java.util.EnumMap)</code>.</a>
             </format>
           </para>
           <para>
@@ -150,13 +150,12 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <param name="keyType">the class object of the key type for this enum map</param>
-        <summary>Creates an empty enum map with the specified key type.</summary>
+        <param name="m">the map from which to initialize this enum map</param>
+        <summary>Creates an enum map initialized from the specified map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumMap#EnumMap(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.util.EnumMap.EnumMap(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumMap#EnumMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.EnumMap.EnumMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/EnumSet.xml b/docs/Mono.Android/en/Java.Util/EnumSet.xml
index 7338d4655d..e014a3c79e 100644
--- a/docs/Mono.Android/en/Java.Util/EnumSet.xml
+++ b/docs/Mono.Android/en/Java.Util/EnumSet.xml
@@ -236,15 +236,15 @@
         <Parameter Name="s" Type="Java.Util.EnumSet" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <param name="&lt;E&gt;&lt;E&gt;">The class of the elements in the collection</param>
-        <param name="c">the collection from which to initialize this enum set</param>
-        <summary>Creates an enum set initialized from the specified collection.</summary>
-        <returns>An enum set initialized from the given collection.</returns>
+        <param name="&lt;E&gt;&lt;E&gt;">The class of the elements in the set</param>
+        <param name="s">the enum set from which to initialize this enum set</param>
+        <summary>Creates an enum set with the same element type as the specified enum
+            set, initially containing the same elements (if any).</summary>
+        <returns>A copy of the specified enum set.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumSet#copyOf(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.copyOf(java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumSet#copyOf(java.util.EnumSet)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.copyOf(java.util.EnumSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -453,16 +453,15 @@
         <Parameter Name="e2" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="&lt;E&gt;&lt;E&gt;">The class of the specified element and of the set</param>
-        <param name="e">the element that this set is to contain initially</param>
-        <summary>Creates an enum set initially containing the specified element.</summary>
-        <returns>an enum set initially containing the specified element</returns>
+        <param name="&lt;E&gt;&lt;E&gt;">The class of the parameter elements and of the set</param>
+        <param name="e1">an element that this set is to contain initially</param>
+        <param name="e2">another element that this set is to contain initially</param>
+        <summary>Creates an enum set initially containing the specified elements.</summary>
+        <returns>an enum set initially containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum,%20java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum, java.lang.Enum)</code>.</a>
             </format>
           </para>
           <para>
@@ -508,16 +507,15 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="first">To be added.</param>
-        <param name="rest">To be added.</param>
-        <param name="&lt;E&gt;&lt;E&gt;">The class of the specified element and of the set</param>
-        <param name="e">the element that this set is to contain initially</param>
-        <summary>Creates an enum set initially containing the specified element.</summary>
-        <returns>an enum set initially containing the specified element</returns>
+        <param name="&lt;E&gt;&lt;E&gt;">The class of the parameter elements and of the set</param>
+        <param name="first">an element that the set is to contain initially</param>
+        <param name="rest">the remaining elements the set is to contain initially</param>
+        <summary>Creates an enum set initially containing the specified elements.</summary>
+        <returns>an enum set initially containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum,%20java.lang.Enum[])" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum, java.lang.Enum[])</code>.</a>
             </format>
           </para>
           <para>
@@ -557,17 +555,16 @@
         <Parameter Name="e3" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="&lt;E&gt;&lt;E&gt;">The class of the specified element and of the set</param>
-        <param name="e">the element that this set is to contain initially</param>
-        <summary>Creates an enum set initially containing the specified element.</summary>
-        <returns>an enum set initially containing the specified element</returns>
+        <param name="&lt;E&gt;&lt;E&gt;">The class of the parameter elements and of the set</param>
+        <param name="e1">an element that this set is to contain initially</param>
+        <param name="e2">another element that this set is to contain initially</param>
+        <param name="e3">another element that this set is to contain initially</param>
+        <summary>Creates an enum set initially containing the specified elements.</summary>
+        <returns>an enum set initially containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum,%20java.lang.Enum,%20java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum, java.lang.Enum, java.lang.Enum)</code>.</a>
             </format>
           </para>
           <para>
@@ -608,18 +605,17 @@
         <Parameter Name="e4" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="&lt;E&gt;&lt;E&gt;">The class of the specified element and of the set</param>
-        <param name="e">the element that this set is to contain initially</param>
-        <summary>Creates an enum set initially containing the specified element.</summary>
-        <returns>an enum set initially containing the specified element</returns>
+        <param name="&lt;E&gt;&lt;E&gt;">The class of the parameter elements and of the set</param>
+        <param name="e1">an element that this set is to contain initially</param>
+        <param name="e2">another element that this set is to contain initially</param>
+        <param name="e3">another element that this set is to contain initially</param>
+        <param name="e4">another element that this set is to contain initially</param>
+        <summary>Creates an enum set initially containing the specified elements.</summary>
+        <returns>an enum set initially containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum,%20java.lang.Enum,%20java.lang.Enum,%20java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum, java.lang.Enum, java.lang.Enum, java.lang.Enum)</code>.</a>
             </format>
           </para>
           <para>
@@ -661,19 +657,18 @@
         <Parameter Name="e5" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="&lt;E&gt;&lt;E&gt;">The class of the specified element and of the set</param>
-        <param name="e">the element that this set is to contain initially</param>
-        <summary>Creates an enum set initially containing the specified element.</summary>
-        <returns>an enum set initially containing the specified element</returns>
+        <param name="&lt;E&gt;&lt;E&gt;">The class of the parameter elements and of the set</param>
+        <param name="e1">an element that this set is to contain initially</param>
+        <param name="e2">another element that this set is to contain initially</param>
+        <param name="e3">another element that this set is to contain initially</param>
+        <param name="e4">another element that this set is to contain initially</param>
+        <param name="e5">another element that this set is to contain initially</param>
+        <summary>Creates an enum set initially containing the specified elements.</summary>
+        <returns>an enum set initially containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/EnumSet#of(java.lang.Enum,%20java.lang.Enum,%20java.lang.Enum,%20java.lang.Enum,%20java.lang.Enum)" title="Reference documentation">Java documentation for <code>java.util.EnumSet.of(java.lang.Enum, java.lang.Enum, java.lang.Enum, java.lang.Enum, java.lang.Enum)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Formatter.xml b/docs/Mono.Android/en/Java.Util/Formatter.xml
index 83d7a2e98a..16906fb2fc 100644
--- a/docs/Mono.Android/en/Java.Util/Formatter.xml
+++ b/docs/Mono.Android/en/Java.Util/Formatter.xml
@@ -103,12 +103,15 @@
         <Parameter Name="file" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="file">The file to use as the destination of this formatter.  If the
+                    file exists then it will be truncated to zero size; otherwise,
+                    a new file will be created.  The output will be written to the
+                    file and is buffered.</param>
+        <summary>Constructs a new formatter with the specified file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -144,12 +147,12 @@
         <Parameter Name="ps" Type="Java.IO.PrintStream" />
       </Parameters>
       <Docs>
-        <param name="ps">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="ps">The stream to use as the destination of this formatter.</param>
+        <summary>Constructs a new formatter with the specified print stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.io.PrintStream)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.io.PrintStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -181,12 +184,13 @@
         <Parameter Name="a" Type="Java.Lang.IAppendable" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="a">Destination for the formatted output.  If <c>a</c> is
+                    <c>null</c> then a <c>StringBuilder</c> will be created.</param>
+        <summary>Constructs a new formatter with the specified destination.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.lang.Appendable)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.lang.Appendable)</code>.</a>
             </format>
           </para>
           <para>
@@ -218,12 +222,14 @@
         <Parameter Name="l" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="l">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="l">The java.util.Locale locale to apply during
+                    formatting.  If <c>l</c> is <c>null</c> then no localization
+                    is applied.</param>
+        <summary>Constructs a new formatter with the specified locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -255,12 +261,13 @@
         <Parameter Name="os" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="os">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="os">The output stream to use as the destination of this formatter.
+                    The output will be buffered.</param>
+        <summary>Constructs a new formatter with the specified output stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -292,12 +299,15 @@
         <Parameter Name="fileName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="fileName">The name of the file to use as the destination of this
+                    formatter.  If the file exists then it will be truncated to
+                    zero size; otherwise, a new file will be created.  The output
+                    will be written to the file and is buffered.</param>
+        <summary>Constructs a new formatter with the specified file name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -334,13 +344,17 @@
         <Parameter Name="csn" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
-        <param name="csn">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="file">The file to use as the destination of this formatter.  If the
+                    file exists then it will be truncated to zero size; otherwise,
+                    a new file will be created.  The output will be written to the
+                    file and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <summary>Constructs a new formatter with the specified file and charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.io.File, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -378,13 +392,16 @@
         <Parameter Name="l" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <param name="l">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="a">Destination for the formatted output.  If <c>a</c> is
+                    <c>null</c> then a <c>StringBuilder</c> will be created.</param>
+        <param name="l">The java.util.Locale locale to apply during
+                    formatting.  If <c>l</c> is <c>null</c> then no localization
+                    is applied.</param>
+        <summary>Constructs a new formatter with the specified destination and locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.lang.Appendable,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.lang.Appendable, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -417,13 +434,16 @@
         <Parameter Name="csn" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="os">To be added.</param>
-        <param name="csn">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="os">The output stream to use as the destination of this formatter.
+                    The output will be buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <summary>Constructs a new formatter with the specified output stream and
+            charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.io.OutputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.io.OutputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -458,13 +478,17 @@
         <Parameter Name="csn" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="csn">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="fileName">The name of the file to use as the destination of this
+                    formatter.  If the file exists then it will be truncated to
+                    zero size; otherwise, a new file will be created.  The output
+                    will be written to the file and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <summary>Constructs a new formatter with the specified file name and charset.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -503,14 +527,21 @@
         <Parameter Name="l" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="file">To be added.</param>
-        <param name="csn">To be added.</param>
-        <param name="l">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="file">The file to use as the destination of this formatter.  If the
+                    file exists then it will be truncated to zero size; otherwise,
+                    a new file will be created.  The output will be written to the
+                    file and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <param name="l">The java.util.Locale locale to apply during
+                    formatting.  If <c>l</c> is <c>null</c> then no localization
+                    is applied.</param>
+        <summary>Constructs a new formatter with the specified file, charset, and
+            locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.io.File,%20java.lang.String,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.io.File, java.lang.String, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -549,14 +580,19 @@
         <Parameter Name="l" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="os">To be added.</param>
-        <param name="csn">To be added.</param>
-        <param name="l">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="os">The output stream to use as the destination of this formatter.
+                    The output will be buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <param name="l">The java.util.Locale locale to apply during
+                    formatting.  If <c>l</c> is <c>null</c> then no localization
+                    is applied.</param>
+        <summary>Constructs a new formatter with the specified output stream, charset,
+            and locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.io.OutputStream,%20java.lang.String,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.io.OutputStream, java.lang.String, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -592,14 +628,21 @@
         <Parameter Name="l" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="fileName">To be added.</param>
-        <param name="csn">To be added.</param>
-        <param name="l">To be added.</param>
-        <summary>Constructs a new formatter.</summary>
+        <param name="fileName">The name of the file to use as the destination of this
+                    formatter.  If the file exists then it will be truncated to
+                    zero size; otherwise, a new file will be created.  The output
+                    will be written to the file and is buffered.</param>
+        <param name="csn">The name of a supported java.nio.charset.Charset
+                    charset</param>
+        <param name="l">The java.util.Locale locale to apply during
+                    formatting.  If <c>l</c> is <c>null</c> then no localization
+                    is applied.</param>
+        <summary>Constructs a new formatter with the specified file name, charset, and
+            locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter()" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Formatter#Formatter(java.lang.String,%20java.lang.String,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Formatter.Formatter(java.lang.String, java.lang.String, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml b/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml
index 1710094400..6eed195b10 100644
--- a/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml
+++ b/docs/Mono.Android/en/Java.Util/GregorianCalendar.xml
@@ -91,14 +91,13 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="aLocale">To be added.</param>
-        <summary>Constructs a default &lt;code&gt;GregorianCalendar&lt;/code&gt; using the current time
-            in the default time zone with the default
-            <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="aLocale">the given locale.</param>
+        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; based on the current time
+            in the default time zone with the given locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar()" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -130,14 +129,14 @@
         <Parameter Name="zone" Type="Java.Util.TimeZone" />
       </Parameters>
       <Docs>
-        <param name="zone">To be added.</param>
-        <summary>Constructs a default &lt;code&gt;GregorianCalendar&lt;/code&gt; using the current time
-            in the default time zone with the default
+        <param name="zone">the given time zone.</param>
+        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; based on the current time
+            in the given time zone with the default
             <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar()" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar(java.util.TimeZone)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar(java.util.TimeZone)</code>.</a>
             </format>
           </para>
           <para>
@@ -170,15 +169,14 @@
         <Parameter Name="aLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="zone">To be added.</param>
-        <param name="aLocale">To be added.</param>
-        <summary>Constructs a default &lt;code&gt;GregorianCalendar&lt;/code&gt; using the current time
-            in the default time zone with the default
-            <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="zone">the given time zone.</param>
+        <param name="aLocale">the given locale.</param>
+        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; based on the current time
+            in the given time zone with the given locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar()" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar(java.util.TimeZone,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar(java.util.TimeZone, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -235,16 +233,16 @@
         <Parameter Name="dayOfMonth" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="dayOfMonth">To be added.</param>
-        <summary>Constructs a default &lt;code&gt;GregorianCalendar&lt;/code&gt; using the current time
-            in the default time zone with the default
-            <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field in the calendar.</param>
+        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field in the calendar.
+            Month value is 0-based. e.g., 0 for January.</param>
+        <param name="dayOfMonth">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field in the calendar.</param>
+        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; with the given date set
+            in the default time zone with the default locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar()" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar(int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -280,18 +278,20 @@
         <Parameter Name="minute" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="dayOfMonth">To be added.</param>
-        <param name="hourOfDay">To be added.</param>
-        <param name="minute">To be added.</param>
-        <summary>Constructs a default &lt;code&gt;GregorianCalendar&lt;/code&gt; using the current time
-            in the default time zone with the default
-            <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field in the calendar.</param>
+        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field in the calendar.
+            Month value is 0-based. e.g., 0 for January.</param>
+        <param name="dayOfMonth">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field in the calendar.</param>
+        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field
+            in the calendar.</param>
+        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field
+            in the calendar.</param>
+        <summary>Constructs a &lt;code&gt;GregorianCalendar&lt;/code&gt; with the given date
+            and time set for the default time zone with the default locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar()" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -328,19 +328,22 @@
         <Parameter Name="second" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">To be added.</param>
-        <param name="month">To be added.</param>
-        <param name="dayOfMonth">To be added.</param>
-        <param name="hourOfDay">To be added.</param>
-        <param name="minute">To be added.</param>
-        <param name="second">To be added.</param>
-        <summary>Constructs a default &lt;code&gt;GregorianCalendar&lt;/code&gt; using the current time
-            in the default time zone with the default
-            <c>Locale.Category#FORMAT FORMAT</c> locale.</summary>
+        <param name="year">the value used to set the &lt;code&gt;YEAR&lt;/code&gt; calendar field in the calendar.</param>
+        <param name="month">the value used to set the &lt;code&gt;MONTH&lt;/code&gt; calendar field in the calendar.
+            Month value is 0-based. e.g., 0 for January.</param>
+        <param name="dayOfMonth">the value used to set the &lt;code&gt;DAY_OF_MONTH&lt;/code&gt; calendar field in the calendar.</param>
+        <param name="hourOfDay">the value used to set the &lt;code&gt;HOUR_OF_DAY&lt;/code&gt; calendar field
+            in the calendar.</param>
+        <param name="minute">the value used to set the &lt;code&gt;MINUTE&lt;/code&gt; calendar field
+            in the calendar.</param>
+        <param name="second">the value used to set the &lt;code&gt;SECOND&lt;/code&gt; calendar field
+            in the calendar.</param>
+        <summary>Constructs a GregorianCalendar with the given date
+            and time set for the default time zone with the default locale.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar()" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#GregorianCalendar(int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.GregorianCalendar(int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -942,14 +945,15 @@
         <Parameter Name="up" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="up">To be added.</param>
         <param name="field">the calendar field.</param>
-        <param name="amount">the signed amount to add to &lt;code&gt;field&lt;/code&gt;.</param>
-        <summary>Adds a signed amount to the specified calendar field without changing larger fields.</summary>
+        <param name="up">indicates if the value of the specified calendar field is to be
+            rolled up or rolled down. Use &lt;code&gt;true&lt;/code&gt; if rolling up, &lt;code&gt;false&lt;/code&gt; otherwise.</param>
+        <summary>Adds or subtracts (up/down) a single unit of time on the given time
+            field without changing larger fields.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#roll(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.roll(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/GregorianCalendar#roll(int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.GregorianCalendar.roll(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/HashMap.xml b/docs/Mono.Android/en/Java.Util/HashMap.xml
index 811facf944..8c6dfa1cbd 100644
--- a/docs/Mono.Android/en/Java.Util/HashMap.xml
+++ b/docs/Mono.Android/en/Java.Util/HashMap.xml
@@ -113,13 +113,13 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <summary>Constructs an empty <c>HashMap</c> with the default initial capacity
-            (16) and the default load factor (0.</summary>
+        <param name="m">the map whose mappings are to be placed in this map</param>
+        <summary>Constructs a new <c>HashMap</c> with the same mappings as the
+            specified <c>Map</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/HashMap#HashMap()" title="Reference documentation">Java documentation for <code>java.util.HashMap.HashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/HashMap#HashMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.HashMap.HashMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -150,13 +150,13 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Constructs an empty <c>HashMap</c> with the default initial capacity
-            (16) and the default load factor (0.</summary>
+        <param name="initialCapacity">the initial capacity.</param>
+        <summary>Constructs an empty <c>HashMap</c> with the specified initial
+            capacity and the default load factor (0.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/HashMap#HashMap()" title="Reference documentation">Java documentation for <code>java.util.HashMap.HashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/HashMap#HashMap(int)" title="Reference documentation">Java documentation for <code>java.util.HashMap.HashMap(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -191,14 +191,14 @@
         <Parameter Name="loadFactor" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
-        <summary>Constructs an empty <c>HashMap</c> with the default initial capacity
-            (16) and the default load factor (0.</summary>
+        <param name="initialCapacity">the initial capacity</param>
+        <param name="loadFactor">the load factor</param>
+        <summary>Constructs an empty <c>HashMap</c> with the specified initial
+            capacity and load factor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/HashMap#HashMap()" title="Reference documentation">Java documentation for <code>java.util.HashMap.HashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/HashMap#HashMap(int,%20float)" title="Reference documentation">Java documentation for <code>java.util.HashMap.HashMap(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -628,8 +628,8 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
         <param name="key">key whose mapping is to be removed from the map</param>
+        <param name="value">To be added.</param>
         <summary>Removes the mapping for the specified key from this map if present.</summary>
         <returns>the previous value associated with <c>key</c>, or
                     <c>null</c> if there was no mapping for <c>key</c>.
diff --git a/docs/Mono.Android/en/Java.Util/HashSet.xml b/docs/Mono.Android/en/Java.Util/HashSet.xml
index e79db4463d..568390f42b 100644
--- a/docs/Mono.Android/en/Java.Util/HashSet.xml
+++ b/docs/Mono.Android/en/Java.Util/HashSet.xml
@@ -119,13 +119,13 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs a new, empty set; the backing <c>HashMap</c> instance has
-            default initial capacity (16) and load factor (0.</summary>
+        <param name="c">the collection whose elements are to be placed into this set</param>
+        <summary>Constructs a new set containing the elements in the specified
+            collection.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/HashSet#HashSet()" title="Reference documentation">Java documentation for <code>java.util.HashSet.HashSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/HashSet#HashSet(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.HashSet.HashSet(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,13 +156,13 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
+        <param name="initialCapacity">the initial capacity of the hash table</param>
         <summary>Constructs a new, empty set; the backing <c>HashMap</c> instance has
-            default initial capacity (16) and load factor (0.</summary>
+            the specified initial capacity and default load factor (0.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/HashSet#HashSet()" title="Reference documentation">Java documentation for <code>java.util.HashSet.HashSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/HashSet#HashSet(int)" title="Reference documentation">Java documentation for <code>java.util.HashSet.HashSet(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -195,14 +195,14 @@
         <Parameter Name="loadFactor" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
+        <param name="initialCapacity">the initial capacity of the hash map</param>
+        <param name="loadFactor">the load factor of the hash map</param>
         <summary>Constructs a new, empty set; the backing <c>HashMap</c> instance has
-            default initial capacity (16) and load factor (0.</summary>
+            the specified initial capacity and the specified load factor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/HashSet#HashSet()" title="Reference documentation">Java documentation for <code>java.util.HashSet.HashSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/HashSet#HashSet(int,%20float)" title="Reference documentation">Java documentation for <code>java.util.HashSet.HashSet(int, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Hashtable.xml b/docs/Mono.Android/en/Java.Util/Hashtable.xml
index 58af750df4..d90d5c9bd9 100644
--- a/docs/Mono.Android/en/Java.Util/Hashtable.xml
+++ b/docs/Mono.Android/en/Java.Util/Hashtable.xml
@@ -111,13 +111,13 @@
         <Parameter Name="t" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="t">To be added.</param>
-        <summary>Constructs a new, empty hashtable with a default initial capacity (11)
-            and load factor (0.</summary>
+        <param name="t">the map whose mappings are to be placed in this map.</param>
+        <summary>Constructs a new hashtable with the same mappings as the given
+            Map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Hashtable#Hashtable()" title="Reference documentation">Java documentation for <code>java.util.Hashtable.Hashtable()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Hashtable#Hashtable(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.Hashtable.Hashtable(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -148,13 +148,13 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Constructs a new, empty hashtable with a default initial capacity (11)
-            and load factor (0.</summary>
+        <param name="initialCapacity">the initial capacity of the hashtable.</param>
+        <summary>Constructs a new, empty hashtable with the specified initial capacity
+            and default load factor (0.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Hashtable#Hashtable()" title="Reference documentation">Java documentation for <code>java.util.Hashtable.Hashtable()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Hashtable#Hashtable(int)" title="Reference documentation">Java documentation for <code>java.util.Hashtable.Hashtable(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,14 +187,14 @@
         <Parameter Name="loadFactor" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
-        <summary>Constructs a new, empty hashtable with a default initial capacity (11)
-            and load factor (0.</summary>
+        <param name="initialCapacity">the initial capacity of the hashtable.</param>
+        <param name="loadFactor">the load factor of the hashtable.</param>
+        <summary>Constructs a new, empty hashtable with the specified initial
+            capacity and the specified load factor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Hashtable#Hashtable()" title="Reference documentation">Java documentation for <code>java.util.Hashtable.Hashtable()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Hashtable#Hashtable(int,%20float)" title="Reference documentation">Java documentation for <code>java.util.Hashtable.Hashtable(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -1189,8 +1189,8 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
         <param name="key">the key that needs to be removed</param>
+        <param name="value">To be added.</param>
         <summary>Removes the key (and its corresponding value) from this
             hashtable.</summary>
         <returns>the value to which the key had been mapped in this hashtable,
diff --git a/docs/Mono.Android/en/Java.Util/ICollection.xml b/docs/Mono.Android/en/Java.Util/ICollection.xml
index 71a4170bd3..9ebb03d3e5 100644
--- a/docs/Mono.Android/en/Java.Util/ICollection.xml
+++ b/docs/Mono.Android/en/Java.Util/ICollection.xml
@@ -721,13 +721,17 @@
         <Parameter Name="a" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <summary>Returns an array containing all of the elements in this collection.</summary>
+        <param name="&lt;T&gt;&lt;T&gt;">the runtime type of the array to contain the collection</param>
+        <param name="a">the array into which the elements of this collection are to be
+                   stored, if it is big enough; otherwise, a new array of the same
+                   runtime type is allocated for this purpose.</param>
+        <summary>Returns an array containing all of the elements in this collection;
+            the runtime type of the returned array is that of the specified array.</summary>
         <returns>an array containing all of the elements in this collection</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Collection#toArray()" title="Reference documentation">Java documentation for <code>java.util.Collection.toArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Collection#toArray(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Collection.toArray(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/IComparator.xml b/docs/Mono.Android/en/Java.Util/IComparator.xml
index 8d2644fe63..c1c66c9796 100644
--- a/docs/Mono.Android/en/Java.Util/IComparator.xml
+++ b/docs/Mono.Android/en/Java.Util/IComparator.xml
@@ -166,17 +166,19 @@
         <Parameter Name="keyComparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="keyComparator">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of element to be compared</param>
-        <param name="&lt;U&gt;&lt;U&gt;">the type of the <c>Comparable</c> sort key</param>
-        <param name="keyExtractor">the function used to extract the <c>Comparable</c> sort key</param>
-        <summary>Accepts a function that extracts a <c>java.lang.Comparable
-            Comparable</c> sort key from a type <c>T</c>, and returns a <c>Comparator&lt;T&gt;</c> that compares by that sort key.</summary>
-        <returns>a comparator that compares by an extracted key</returns>
+        <param name="&lt;U&gt;&lt;U&gt;">the type of the sort key</param>
+        <param name="keyExtractor">the function used to extract the sort key</param>
+        <param name="keyComparator">the <c>Comparator</c> used to compare the sort key</param>
+        <summary>Accepts a function that extracts a sort key from a type <c>T</c>, and
+            returns a <c>Comparator&lt;T&gt;</c> that compares by that sort key using
+            the specified <c>Comparator</c>.</summary>
+        <returns>a comparator that compares by an extracted key using the
+                    specified <c>Comparator</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Comparator#comparing(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.Comparator.comparing(java.util.function.Function)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Comparator#comparing(java.util.function.Function,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Comparator.comparing(java.util.function.Function, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -623,16 +625,16 @@
         <Parameter Name="keyExtractor" Type="Java.Util.Functions.IFunction" />
       </Parameters>
       <Docs>
-        <param name="keyExtractor">To be added.</param>
-        <param name="other">the other comparator to be used when this comparator
-                    compares two objects that are equal.</param>
-        <summary>Returns a lexicographic-order comparator with another comparator.</summary>
+        <param name="&lt;U&gt;&lt;U&gt;">the type of the <c>Comparable</c> sort key</param>
+        <param name="keyExtractor">the function used to extract the <c>Comparable</c> sort key</param>
+        <summary>Returns a lexicographic-order comparator with a function that
+            extracts a <c>Comparable</c> sort key.</summary>
         <returns>a lexicographic-order comparator composed of this and then the
-                    other comparator</returns>
+                    <c>Comparable</c> sort key.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Comparator#thenComparing(java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Comparator.thenComparing(java.util.Comparator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Comparator#thenComparing(java.util.function.Function)" title="Reference documentation">Java documentation for <code>java.util.Comparator.thenComparing(java.util.function.Function)</code>.</a>
             </format>
           </para>
           <para>
@@ -713,17 +715,17 @@
         <Parameter Name="keyComparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="keyExtractor">To be added.</param>
-        <param name="keyComparator">To be added.</param>
-        <param name="other">the other comparator to be used when this comparator
-                    compares two objects that are equal.</param>
-        <summary>Returns a lexicographic-order comparator with another comparator.</summary>
-        <returns>a lexicographic-order comparator composed of this and then the
-                    other comparator</returns>
+        <param name="&lt;U&gt;&lt;U&gt;">the type of the sort key</param>
+        <param name="keyExtractor">the function used to extract the sort key</param>
+        <param name="keyComparator">the <c>Comparator</c> used to compare the sort key</param>
+        <summary>Returns a lexicographic-order comparator with a function that
+            extracts a key to be compared with the given <c>Comparator</c>.</summary>
+        <returns>a lexicographic-order comparator composed of this comparator
+                    and then comparing on the key extracted by the keyExtractor function</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Comparator#thenComparing(java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Comparator.thenComparing(java.util.Comparator)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Comparator#thenComparing(java.util.function.Function,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.Comparator.thenComparing(java.util.function.Function, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/IDeque.xml b/docs/Mono.Android/en/Java.Util/IDeque.xml
index 7addd11977..b945851d49 100644
--- a/docs/Mono.Android/en/Java.Util/IDeque.xml
+++ b/docs/Mono.Android/en/Java.Util/IDeque.xml
@@ -956,13 +956,13 @@
       </Parameters>
       <Docs>
         <param name="o">element to be removed from this deque, if present</param>
-        <summary>Retrieves and removes the head of the queue represented by this deque
-            (in other words, the first element of this deque).</summary>
-        <returns>the head of the queue represented by this deque</returns>
+        <summary>Removes the first occurrence of the specified element from this deque.</summary>
+        <returns>
+          <c>true</c> if an element was removed as a result of this call</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Deque#remove()" title="Reference documentation">Java documentation for <code>java.util.Deque.remove()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Deque#remove(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Deque.remove(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/IList.xml b/docs/Mono.Android/en/Java.Util/IList.xml
index 81847e4f8c..38c81fcc62 100644
--- a/docs/Mono.Android/en/Java.Util/IList.xml
+++ b/docs/Mono.Android/en/Java.Util/IList.xml
@@ -78,16 +78,15 @@
         <Parameter Name="e" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="index">index at which the specified element is to be inserted</param>
-        <param name="element">element to be inserted</param>
-        <summary>Inserts the specified element at the specified position in this list
-            (optional operation).</summary>
-        <returns>To be added.</returns>
+        <param name="e">element to be appended to this list</param>
+        <summary>Appends the specified element to the end of this list (optional
+            operation).</summary>
+        <returns>
+          <c>true</c> (as specified by <c>Collection#add</c>)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#add(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.add(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#add(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.add(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -166,17 +165,16 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="index">index at which to insert the first element from the
-                         specified collection</param>
         <param name="c">collection containing elements to be added to this list</param>
-        <summary>Inserts all of the elements in the specified collection into this
-            list at the specified position (optional operation).</summary>
+        <summary>Appends all of the elements in the specified collection to the end of
+            this list, in the order that they are returned by the specified
+            collection's iterator (optional operation).</summary>
         <returns>
           <c>true</c> if this list changed as a result of the call</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#addAll(int,%20java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.List.addAll(int, java.util.Collection)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#addAll(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.List.addAll(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -805,15 +803,16 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
+        <param name="index">index of the first element to be returned from the
+                   list iterator (by a call to <c>ListIterator#next next</c>)</param>
         <summary>Returns a list iterator over the elements in this list (in proper
-            sequence).</summary>
+            sequence), starting at the specified position in the list.</summary>
         <returns>a list iterator over the elements in this list (in proper
-                    sequence)</returns>
+                    sequence), starting at the specified position in the list</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#listIterator()" title="Reference documentation">Java documentation for <code>java.util.List.listIterator()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#listIterator(int)" title="Reference documentation">Java documentation for <code>java.util.List.listIterator(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -896,14 +895,14 @@
         <Parameter Name="e1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the single element</param>
+        <summary>Returns an unmodifiable list containing one element.</summary>
+        <returns>a <c>List</c> containing the specified element</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -948,14 +947,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="elements">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="elements">the elements to be contained in the list</param>
+        <summary>Returns an unmodifiable list containing an arbitrary number of elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -994,15 +993,15 @@
         <Parameter Name="e2" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <summary>Returns an unmodifiable list containing two elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1042,16 +1041,16 @@
         <Parameter Name="e3" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <summary>Returns an unmodifiable list containing three elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1092,17 +1091,17 @@
         <Parameter Name="e4" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <summary>Returns an unmodifiable list containing four elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1144,18 +1143,18 @@
         <Parameter Name="e5" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <summary>Returns an unmodifiable list containing five elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1198,19 +1197,19 @@
         <Parameter Name="e6" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <summary>Returns an unmodifiable list containing six elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1254,20 +1253,20 @@
         <Parameter Name="e7" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <summary>Returns an unmodifiable list containing seven elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1312,21 +1311,21 @@
         <Parameter Name="e8" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <summary>Returns an unmodifiable list containing eight elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1372,22 +1371,22 @@
         <Parameter Name="e9" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <summary>Returns an unmodifiable list containing nine elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1434,23 +1433,23 @@
         <Parameter Name="e10" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
-        <param name="e10">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <param name="e10">the tenth element</param>
+        <summary>Returns an unmodifiable list containing ten elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1487,15 +1486,15 @@
         <Parameter Name="o" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="o">To be added.</param>
-        <param name="index">the index of the element to be removed</param>
-        <summary>Removes the element at the specified position in this list (optional
-            operation).</summary>
-        <returns>the element previously at the specified position</returns>
+        <param name="o">element to be removed from this list, if present</param>
+        <summary>Removes the first occurrence of the specified element from this list,
+            if it is present (optional operation).</summary>
+        <returns>
+          <c>true</c> if this list contained the specified element</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#remove(int)" title="Reference documentation">Java documentation for <code>java.util.List.remove(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#remove(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.remove(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1916,15 +1915,17 @@
         <Parameter Name="a" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <summary>Returns an array containing all of the elements in this list in proper
-            sequence (from first to last element).</summary>
-        <returns>an array containing all of the elements in this list in proper
-                    sequence</returns>
+        <param name="a">the array into which the elements of this list are to
+                     be stored, if it is big enough; otherwise, a new array of the
+                     same runtime type is allocated for this purpose.</param>
+        <summary>Returns an array containing all of the elements in this list in
+            proper sequence (from first to last element); the runtime type of
+            the returned array is that of the specified array.</summary>
+        <returns>an array containing the elements of this list</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#toArray()" title="Reference documentation">Java documentation for <code>java.util.List.toArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#toArray(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.List.toArray(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/IMap.xml b/docs/Mono.Android/en/Java.Util/IMap.xml
index eac16532d0..50e5184443 100644
--- a/docs/Mono.Android/en/Java.Util/IMap.xml
+++ b/docs/Mono.Android/en/Java.Util/IMap.xml
@@ -343,8 +343,6 @@
         <Parameter Name="v" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="&lt;K&gt;&lt;K&gt;">the key's type</param>
-        <param name="&lt;V&gt;&lt;V&gt;">the value's type</param>
         <param name="k">the key</param>
         <param name="v">the value</param>
         <summary>Returns an immutable <c>Entry</c> containing the given key and value.</summary>
@@ -798,16 +796,16 @@
         <Parameter Name="v1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the mapping's key</param>
+        <param name="v1">the mapping's value</param>
+        <summary>Returns an immutable map containing a single mapping.</summary>
+        <returns>a <c>Map</c> containing the specified mapping</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -848,18 +846,18 @@
         <Parameter Name="v2" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <summary>Returns an immutable map containing two mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -902,20 +900,20 @@
         <Parameter Name="v3" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <summary>Returns an immutable map containing three mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -960,22 +958,22 @@
         <Parameter Name="v4" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <summary>Returns an immutable map containing four mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1022,24 +1020,24 @@
         <Parameter Name="v5" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <summary>Returns an immutable map containing five mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1088,26 +1086,26 @@
         <Parameter Name="v6" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <summary>Returns an immutable map containing six mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1158,28 +1156,28 @@
         <Parameter Name="v7" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <summary>Returns an immutable map containing seven mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1232,30 +1230,30 @@
         <Parameter Name="v8" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
-        <param name="k8">To be added.</param>
-        <param name="v8">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <param name="k8">the eighth mapping's key</param>
+        <param name="v8">the eighth mapping's value</param>
+        <summary>Returns an immutable map containing eight mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1310,32 +1308,32 @@
         <Parameter Name="v9" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
-        <param name="k8">To be added.</param>
-        <param name="v8">To be added.</param>
-        <param name="k9">To be added.</param>
-        <param name="v9">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <param name="k8">the eighth mapping's key</param>
+        <param name="v8">the eighth mapping's value</param>
+        <param name="k9">the ninth mapping's key</param>
+        <param name="v9">the ninth mapping's value</param>
+        <summary>Returns an immutable map containing nine mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1392,34 +1390,34 @@
         <Parameter Name="v10" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
-        <param name="k8">To be added.</param>
-        <param name="v8">To be added.</param>
-        <param name="k9">To be added.</param>
-        <param name="v9">To be added.</param>
-        <param name="k10">To be added.</param>
-        <param name="v10">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <param name="k8">the eighth mapping's key</param>
+        <param name="v8">the eighth mapping's value</param>
+        <param name="k9">the ninth mapping's key</param>
+        <param name="v9">the ninth mapping's value</param>
+        <param name="k10">the tenth mapping's key</param>
+        <param name="v10">the tenth mapping's value</param>
+        <summary>Returns an immutable map containing ten mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1464,8 +1462,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
-        <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
         <param name="entries">
           <c>Map.Entry</c>s containing the keys and values from which the map is populated</param>
         <summary>Returns an immutable map containing keys and values extracted from the given entries.</summary>
@@ -1688,8 +1684,8 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
         <param name="key">key whose mapping is to be removed from the map</param>
+        <param name="value">To be added.</param>
         <summary>Removes the mapping for a key from this map if it is present
             (optional operation).</summary>
         <returns>the previous value associated with <c>key</c>, or
diff --git a/docs/Mono.Android/en/Java.Util/INavigableMap.xml b/docs/Mono.Android/en/Java.Util/INavigableMap.xml
index 3cce66f2e8..aec0cea776 100644
--- a/docs/Mono.Android/en/Java.Util/INavigableMap.xml
+++ b/docs/Mono.Android/en/Java.Util/INavigableMap.xml
@@ -407,14 +407,18 @@
         <Parameter Name="inclusive" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="toKey">To be added.</param>
-        <param name="inclusive">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="toKey">high endpoint of the keys in the returned map</param>
+        <param name="inclusive">
+          <c>true</c> if the high endpoint
+                   is to be included in the returned view</param>
+        <summary>Returns a view of the portion of this map whose keys are less than (or
+            equal to, if <c>inclusive</c> is true) <c>toKey</c>.</summary>
+        <returns>a view of the portion of this map whose keys are less than
+                    (or equal to, if <c>inclusive</c> is true) <c>toKey</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/NavigableMap#headMap(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.NavigableMap.headMap(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/NavigableMap#headMap(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.NavigableMap.headMap(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -824,16 +828,22 @@
         <Parameter Name="toInclusive" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fromKey">To be added.</param>
-        <param name="fromInclusive">To be added.</param>
-        <param name="toKey">To be added.</param>
-        <param name="toInclusive">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="fromKey">low endpoint of the keys in the returned map</param>
+        <param name="fromInclusive">
+          <c>true</c> if the low endpoint
+                   is to be included in the returned view</param>
+        <param name="toKey">high endpoint of the keys in the returned map</param>
+        <param name="toInclusive">
+          <c>true</c> if the high endpoint
+                   is to be included in the returned view</param>
+        <summary>Returns a view of the portion of this map whose keys range from
+            <c>fromKey</c> to <c>toKey</c>.</summary>
+        <returns>a view of the portion of this map whose keys range from
+                    <c>fromKey</c> to <c>toKey</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/NavigableMap#subMap(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.NavigableMap.subMap(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/NavigableMap#subMap(java.lang.Object,%20boolean,%20java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.NavigableMap.subMap(java.lang.Object, boolean, java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -911,14 +921,18 @@
         <Parameter Name="inclusive" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fromKey">To be added.</param>
-        <param name="inclusive">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="fromKey">low endpoint of the keys in the returned map</param>
+        <param name="inclusive">
+          <c>true</c> if the low endpoint
+                   is to be included in the returned view</param>
+        <summary>Returns a view of the portion of this map whose keys are greater than (or
+            equal to, if <c>inclusive</c> is true) <c>fromKey</c>.</summary>
+        <returns>a view of the portion of this map whose keys are greater than
+                    (or equal to, if <c>inclusive</c> is true) <c>fromKey</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/NavigableMap#tailMap(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.NavigableMap.tailMap(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/NavigableMap#tailMap(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.NavigableMap.tailMap(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/INavigableSet.xml b/docs/Mono.Android/en/Java.Util/INavigableSet.xml
index f5132b1614..c9a25d16a0 100644
--- a/docs/Mono.Android/en/Java.Util/INavigableSet.xml
+++ b/docs/Mono.Android/en/Java.Util/INavigableSet.xml
@@ -286,14 +286,18 @@
         <Parameter Name="inclusive" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="toElement">To be added.</param>
-        <param name="inclusive">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="toElement">high endpoint of the returned set</param>
+        <param name="inclusive">
+          <c>true</c> if the high endpoint
+                   is to be included in the returned view</param>
+        <summary>Returns a view of the portion of this set whose elements are less than
+            (or equal to, if <c>inclusive</c> is true) <c>toElement</c>.</summary>
+        <returns>a view of the portion of this set whose elements are less than
+                    (or equal to, if <c>inclusive</c> is true) <c>toElement</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/NavigableSet#headSet(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.NavigableSet.headSet(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/NavigableSet#headSet(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.NavigableSet.headSet(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -578,16 +582,22 @@
         <Parameter Name="toInclusive" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fromElement">To be added.</param>
-        <param name="fromInclusive">To be added.</param>
-        <param name="toElement">To be added.</param>
-        <param name="toInclusive">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="fromElement">low endpoint of the returned set</param>
+        <param name="fromInclusive">
+          <c>true</c> if the low endpoint
+                   is to be included in the returned view</param>
+        <param name="toElement">high endpoint of the returned set</param>
+        <param name="toInclusive">
+          <c>true</c> if the high endpoint
+                   is to be included in the returned view</param>
+        <summary>Returns a view of the portion of this set whose elements range from
+            <c>fromElement</c> to <c>toElement</c>.</summary>
+        <returns>a view of the portion of this set whose elements range from
+                    <c>fromElement</c>, inclusive, to <c>toElement</c>, exclusive</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/NavigableSet#subSet(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.NavigableSet.subSet(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/NavigableSet#subSet(java.lang.Object,%20boolean,%20java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.NavigableSet.subSet(java.lang.Object, boolean, java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -665,14 +675,18 @@
         <Parameter Name="inclusive" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="fromElement">To be added.</param>
-        <param name="inclusive">To be added.</param>
-        <summary>[TODO: @inheritDoc]</summary>
-        <returns>To be added.</returns>
+        <param name="fromElement">low endpoint of the returned set</param>
+        <param name="inclusive">
+          <c>true</c> if the low endpoint
+                   is to be included in the returned view</param>
+        <summary>Returns a view of the portion of this set whose elements are greater
+            than (or equal to, if <c>inclusive</c> is true) <c>fromElement</c>.</summary>
+        <returns>a view of the portion of this set whose elements are greater
+                    than or equal to <c>fromElement</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/NavigableSet#tailSet(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.NavigableSet.tailSet(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/NavigableSet#tailSet(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.NavigableSet.tailSet(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ISet.xml b/docs/Mono.Android/en/Java.Util/ISet.xml
index dbc632f5c8..03ff86344a 100644
--- a/docs/Mono.Android/en/Java.Util/ISet.xml
+++ b/docs/Mono.Android/en/Java.Util/ISet.xml
@@ -594,14 +594,14 @@
         <Parameter Name="e1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the single element</param>
+        <summary>Returns an immutable set containing one element.</summary>
+        <returns>a <c>Set</c> containing the specified element</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -646,14 +646,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="elements">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="elements">the elements to be contained in the set</param>
+        <summary>Returns an immutable set containing an arbitrary number of elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -692,15 +692,15 @@
         <Parameter Name="e2" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <summary>Returns an immutable set containing two elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -740,16 +740,16 @@
         <Parameter Name="e3" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <summary>Returns an immutable set containing three elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -790,17 +790,17 @@
         <Parameter Name="e4" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <summary>Returns an immutable set containing four elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -842,18 +842,18 @@
         <Parameter Name="e5" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <summary>Returns an immutable set containing five elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -896,19 +896,19 @@
         <Parameter Name="e6" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <summary>Returns an immutable set containing six elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -952,20 +952,20 @@
         <Parameter Name="e7" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <summary>Returns an immutable set containing seven elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1010,21 +1010,21 @@
         <Parameter Name="e8" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <summary>Returns an immutable set containing eight elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1070,22 +1070,22 @@
         <Parameter Name="e9" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <summary>Returns an immutable set containing nine elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1132,23 +1132,23 @@
         <Parameter Name="e10" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
-        <param name="e10">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <param name="e10">the tenth element</param>
+        <summary>Returns an immutable set containing ten elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1409,13 +1409,16 @@
         <Parameter Name="a" Type="Java.Lang.Object[]" />
       </Parameters>
       <Docs>
-        <param name="a">To be added.</param>
-        <summary>Returns an array containing all of the elements in this set.</summary>
+        <param name="a">the array into which the elements of this set are to be
+                   stored, if it is big enough; otherwise, a new array of the same
+                   runtime type is allocated for this purpose.</param>
+        <summary>Returns an array containing all of the elements in this set; the
+            runtime type of the returned array is that of the specified array.</summary>
         <returns>an array containing all the elements in this set</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#toArray()" title="Reference documentation">Java documentation for <code>java.util.Set.toArray()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#toArray(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Set.toArray(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/IdentityHashMap.xml b/docs/Mono.Android/en/Java.Util/IdentityHashMap.xml
index 90a2b4e1b0..5531665fc6 100644
--- a/docs/Mono.Android/en/Java.Util/IdentityHashMap.xml
+++ b/docs/Mono.Android/en/Java.Util/IdentityHashMap.xml
@@ -113,13 +113,13 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <summary>Constructs a new, empty identity hash map with a default expected
-            maximum size (21).</summary>
+        <param name="m">the map whose mappings are to be placed into this map</param>
+        <summary>Constructs a new identity hash map containing the keys-value mappings
+            in the specified map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/IdentityHashMap#IdentityHashMap()" title="Reference documentation">Java documentation for <code>java.util.IdentityHashMap.IdentityHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/IdentityHashMap#IdentityHashMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.IdentityHashMap.IdentityHashMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -150,13 +150,12 @@
         <Parameter Name="expectedMaxSize" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="expectedMaxSize">To be added.</param>
-        <summary>Constructs a new, empty identity hash map with a default expected
-            maximum size (21).</summary>
+        <param name="expectedMaxSize">the expected maximum size of the map</param>
+        <summary>Constructs a new, empty map with the specified expected maximum size.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/IdentityHashMap#IdentityHashMap()" title="Reference documentation">Java documentation for <code>java.util.IdentityHashMap.IdentityHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/IdentityHashMap#IdentityHashMap(int)" title="Reference documentation">Java documentation for <code>java.util.IdentityHashMap.IdentityHashMap(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml b/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml
index 08dd5cdb2d..31e2e6ce87 100644
--- a/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml
+++ b/docs/Mono.Android/en/Java.Util/IllformedLocaleException.xml
@@ -87,13 +87,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a new &lt;code&gt;IllformedLocaleException&lt;/code&gt; with no
-            detail message and -1 as the error index.</summary>
+        <param name="message">the message</param>
+        <summary>Constructs a new &lt;code&gt;IllformedLocaleException&lt;/code&gt; with the
+            given message and -1 as the error index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/IllformedLocaleException#IllformedLocaleException()" title="Reference documentation">Java documentation for <code>java.util.IllformedLocaleException.IllformedLocaleException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/IllformedLocaleException#IllformedLocaleException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.IllformedLocaleException.IllformedLocaleException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -148,14 +148,14 @@
         <Parameter Name="errorIndex" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="errorIndex">To be added.</param>
-        <summary>Constructs a new &lt;code&gt;IllformedLocaleException&lt;/code&gt; with no
-            detail message and -1 as the error index.</summary>
+        <param name="message">the message</param>
+        <param name="errorIndex">the index</param>
+        <summary>Constructs a new &lt;code&gt;IllformedLocaleException&lt;/code&gt; with the
+            given message and the error index.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/IllformedLocaleException#IllformedLocaleException()" title="Reference documentation">Java documentation for <code>java.util.IllformedLocaleException.IllformedLocaleException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/IllformedLocaleException#IllformedLocaleException(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.util.IllformedLocaleException.IllformedLocaleException(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/InputMismatchException.xml b/docs/Mono.Android/en/Java.Util/InputMismatchException.xml
index e45a890521..18f0c5d882 100644
--- a/docs/Mono.Android/en/Java.Util/InputMismatchException.xml
+++ b/docs/Mono.Android/en/Java.Util/InputMismatchException.xml
@@ -103,13 +103,14 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs an &lt;code&gt;InputMismatchException&lt;/code&gt; with <c>null</c>
-            as its error message string.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs an &lt;code&gt;InputMismatchException&lt;/code&gt;, saving a reference
+            to the error message string <c>s</c> for later retrieval by the
+            <c>getMessage</c> method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/InputMismatchException#InputMismatchException()" title="Reference documentation">Java documentation for <code>java.util.InputMismatchException.InputMismatchException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/InputMismatchException#InputMismatchException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.InputMismatchException.InputMismatchException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/InvalidPropertiesFormatException.xml b/docs/Mono.Android/en/Java.Util/InvalidPropertiesFormatException.xml
index aee4b33173..1d97370d9d 100644
--- a/docs/Mono.Android/en/Java.Util/InvalidPropertiesFormatException.xml
+++ b/docs/Mono.Android/en/Java.Util/InvalidPropertiesFormatException.xml
@@ -57,15 +57,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">the detail message. The detail message is saved for
-                     later retrieval by the <c>Throwable#getMessage()</c> method.</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                    <c>Throwable#getCause()</c> method).</param>
         <summary>Constructs an InvalidPropertiesFormatException with the specified
-            detail message.</summary>
+            cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/InvalidPropertiesFormatException#InvalidPropertiesFormatException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.InvalidPropertiesFormatException.InvalidPropertiesFormatException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/InvalidPropertiesFormatException#InvalidPropertiesFormatException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.InvalidPropertiesFormatException.InvalidPropertiesFormatException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/LinkedHashMap.xml b/docs/Mono.Android/en/Java.Util/LinkedHashMap.xml
index 59082787e4..a93f143657 100644
--- a/docs/Mono.Android/en/Java.Util/LinkedHashMap.xml
+++ b/docs/Mono.Android/en/Java.Util/LinkedHashMap.xml
@@ -108,13 +108,13 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <summary>Constructs an empty insertion-ordered <c>LinkedHashMap</c> instance
-            with the default initial capacity (16) and load factor (0.</summary>
+        <param name="m">the map whose mappings are to be placed in this map</param>
+        <summary>Constructs an insertion-ordered <c>LinkedHashMap</c> instance with
+            the same mappings as the specified map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap()" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -145,13 +145,13 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
+        <param name="initialCapacity">the initial capacity</param>
         <summary>Constructs an empty insertion-ordered <c>LinkedHashMap</c> instance
-            with the default initial capacity (16) and load factor (0.</summary>
+            with the specified initial capacity and a default load factor (0.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap()" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap(int)" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,14 +186,14 @@
         <Parameter Name="loadFactor" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
+        <param name="initialCapacity">the initial capacity</param>
+        <param name="loadFactor">the load factor</param>
         <summary>Constructs an empty insertion-ordered <c>LinkedHashMap</c> instance
-            with the default initial capacity (16) and load factor (0.</summary>
+            with the specified initial capacity and load factor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap()" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap(int,%20float)" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap(int, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -253,15 +253,16 @@
         <Parameter Name="accessOrder" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
-        <param name="accessOrder">To be added.</param>
-        <summary>Constructs an empty insertion-ordered <c>LinkedHashMap</c> instance
-            with the default initial capacity (16) and load factor (0.</summary>
+        <param name="initialCapacity">the initial capacity</param>
+        <param name="loadFactor">the load factor</param>
+        <param name="accessOrder">the ordering mode - <c>true</c> for
+                    access-order, <c>false</c> for insertion-order</param>
+        <summary>Constructs an empty <c>LinkedHashMap</c> instance with the
+            specified initial capacity, load factor and ordering mode.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap()" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedHashMap#LinkedHashMap(int,%20float,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.LinkedHashMap.LinkedHashMap(int, float, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/LinkedHashSet.xml b/docs/Mono.Android/en/Java.Util/LinkedHashSet.xml
index 892a3532c7..e10895586c 100644
--- a/docs/Mono.Android/en/Java.Util/LinkedHashSet.xml
+++ b/docs/Mono.Android/en/Java.Util/LinkedHashSet.xml
@@ -119,13 +119,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs a new, empty linked hash set with the default initial
-            capacity (16) and load factor (0.</summary>
+        <param name="c">the collection whose elements are to be placed into
+                      this set</param>
+        <summary>Constructs a new linked hash set with the same elements as the
+            specified collection.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedHashSet#LinkedHashSet()" title="Reference documentation">Java documentation for <code>java.util.LinkedHashSet.LinkedHashSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedHashSet#LinkedHashSet(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.LinkedHashSet.LinkedHashSet(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,13 +157,13 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Constructs a new, empty linked hash set with the default initial
-            capacity (16) and load factor (0.</summary>
+        <param name="initialCapacity">the initial capacity of the LinkedHashSet</param>
+        <summary>Constructs a new, empty linked hash set with the specified initial
+            capacity and the default load factor (0.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedHashSet#LinkedHashSet()" title="Reference documentation">Java documentation for <code>java.util.LinkedHashSet.LinkedHashSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedHashSet#LinkedHashSet(int)" title="Reference documentation">Java documentation for <code>java.util.LinkedHashSet.LinkedHashSet(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -195,14 +196,14 @@
         <Parameter Name="loadFactor" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
-        <summary>Constructs a new, empty linked hash set with the default initial
-            capacity (16) and load factor (0.</summary>
+        <param name="initialCapacity">the initial capacity of the linked hash set</param>
+        <param name="loadFactor">the load factor of the linked hash set</param>
+        <summary>Constructs a new, empty linked hash set with the specified initial
+            capacity and load factor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedHashSet#LinkedHashSet()" title="Reference documentation">Java documentation for <code>java.util.LinkedHashSet.LinkedHashSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedHashSet#LinkedHashSet(int,%20float)" title="Reference documentation">Java documentation for <code>java.util.LinkedHashSet.LinkedHashSet(int, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/LinkedList.xml b/docs/Mono.Android/en/Java.Util/LinkedList.xml
index 9b81f99b00..b98189575a 100644
--- a/docs/Mono.Android/en/Java.Util/LinkedList.xml
+++ b/docs/Mono.Android/en/Java.Util/LinkedList.xml
@@ -124,12 +124,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs an empty list.</summary>
+        <param name="c">the collection whose elements are to be placed into this list</param>
+        <summary>Constructs a list containing the elements of the specified
+            collection, in the order they are returned by the collection's
+            iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LinkedList#LinkedList()" title="Reference documentation">Java documentation for <code>java.util.LinkedList.LinkedList()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LinkedList#LinkedList(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.LinkedList.LinkedList(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/List.xml b/docs/Mono.Android/en/Java.Util/List.xml
index fe2d0932ca..0198bfdf19 100644
--- a/docs/Mono.Android/en/Java.Util/List.xml
+++ b/docs/Mono.Android/en/Java.Util/List.xml
@@ -153,14 +153,14 @@
         <Parameter Name="e1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the single element</param>
+        <summary>Returns an unmodifiable list containing one element.</summary>
+        <returns>a <c>List</c> containing the specified element</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -209,14 +209,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="elements">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="elements">the elements to be contained in the list</param>
+        <summary>Returns an unmodifiable list containing an arbitrary number of elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -259,15 +259,15 @@
         <Parameter Name="e2" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <summary>Returns an unmodifiable list containing two elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -311,16 +311,16 @@
         <Parameter Name="e3" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <summary>Returns an unmodifiable list containing three elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -365,17 +365,17 @@
         <Parameter Name="e4" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <summary>Returns an unmodifiable list containing four elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -421,18 +421,18 @@
         <Parameter Name="e5" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <summary>Returns an unmodifiable list containing five elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -479,19 +479,19 @@
         <Parameter Name="e6" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <summary>Returns an unmodifiable list containing six elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -539,20 +539,20 @@
         <Parameter Name="e7" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <summary>Returns an unmodifiable list containing seven elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -601,21 +601,21 @@
         <Parameter Name="e8" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <summary>Returns an unmodifiable list containing eight elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -665,22 +665,22 @@
         <Parameter Name="e9" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <summary>Returns an unmodifiable list containing nine elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -731,23 +731,23 @@
         <Parameter Name="e10" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
-        <param name="e10">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>List</c>'s element type</param>
-        <summary>Returns an unmodifiable list containing zero elements.</summary>
-        <returns>an empty <c>List</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <param name="e10">the tenth element</param>
+        <summary>Returns an unmodifiable list containing ten elements.</summary>
+        <returns>a <c>List</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/List#of()" title="Reference documentation">Java documentation for <code>java.util.List.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/List#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.List.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Locale.xml b/docs/Mono.Android/en/Java.Util/Locale.xml
index ec3e8f9a82..1e7400a5e0 100644
--- a/docs/Mono.Android/en/Java.Util/Locale.xml
+++ b/docs/Mono.Android/en/Java.Util/Locale.xml
@@ -67,12 +67,14 @@
         <Parameter Name="language" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="language">To be added.</param>
-        <summary>Private constructor used by getInstance method</summary>
+        <param name="language">An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
+            up to 8 characters in length.  See the &lt;code&gt;Locale&lt;/code&gt; class description about
+            valid language values.</param>
+        <summary>Construct a locale from a language code.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#Locale(.*BaseLocale,%20.*LocaleExtensions)" title="Reference documentation">Java documentation for <code>java.util.Locale.Locale(.*BaseLocale, .*LocaleExtensions)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#Locale(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Locale.Locale(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -105,13 +107,16 @@
         <Parameter Name="country" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="language">To be added.</param>
-        <param name="country">To be added.</param>
-        <summary>Private constructor used by getInstance method</summary>
+        <param name="language">An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
+            up to 8 characters in length.  See the &lt;code&gt;Locale&lt;/code&gt; class description about
+            valid language values.</param>
+        <param name="country">An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code.
+            See the &lt;code&gt;Locale&lt;/code&gt; class description about valid country values.</param>
+        <summary>Construct a locale from language and country.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#Locale(.*BaseLocale,%20.*LocaleExtensions)" title="Reference documentation">Java documentation for <code>java.util.Locale.Locale(.*BaseLocale, .*LocaleExtensions)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#Locale(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Locale.Locale(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -145,14 +150,18 @@
         <Parameter Name="variant" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="language">To be added.</param>
-        <param name="country">To be added.</param>
-        <param name="variant">To be added.</param>
-        <summary>Private constructor used by getInstance method</summary>
+        <param name="language">An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
+            up to 8 characters in length.  See the &lt;code&gt;Locale&lt;/code&gt; class description about
+            valid language values.</param>
+        <param name="country">An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code.
+            See the &lt;code&gt;Locale&lt;/code&gt; class description about valid country values.</param>
+        <param name="variant">Any arbitrary value used to indicate a variation of a &lt;code&gt;Locale&lt;/code&gt;.
+            See the &lt;code&gt;Locale&lt;/code&gt; class description for the details.</param>
+        <summary>Construct a locale from language, country and variant.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#Locale(.*BaseLocale,%20.*LocaleExtensions)" title="Reference documentation">Java documentation for <code>java.util.Locale.Locale(.*BaseLocale, .*LocaleExtensions)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#Locale(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Locale.Locale(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -413,11 +422,9 @@
         <ReturnType>Java.Util.Locale</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="category">- the specified category to set the default locale</param>
-        <param name="newLocale">- the new default locale</param>
+        <param name="newLocale">the new default locale</param>
         <summary>Gets the current value of the default locale for this instance
-            of the Java Virtual Machine. -or- Sets the default locale for the specified Category for this instance
-            of the Java Virtual Machine.</summary>
+            of the Java Virtual Machine. -or- Sets the default locale for this instance of the Java Virtual Machine.</summary>
         <value>the default locale for this instance of the Java Virtual Machine</value>
         <remarks>
           <para>Property getter documentation:</para>
@@ -429,7 +436,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#setDefault(java.util.Category,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Locale.setDefault(java.util.Category, java.util.Locale)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#setDefault(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Locale.setDefault(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -778,11 +785,11 @@
         <Parameter Name="mode" Type="Java.Util.Locale+FilteringMode" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
         <param name="priorityList">user's Language Priority List in which each language
                 tag is sorted in descending order based on priority or weight</param>
         <param name="locales">
           <c>Locale</c> instances used for matching</param>
+        <param name="mode">To be added.</param>
         <summary>Returns a list of matching <c>Locale</c> instances using the filtering
             mechanism defined in RFC 4647.</summary>
         <returns>a list of <c>Locale</c> instances for matching language tags
@@ -873,10 +880,10 @@
         <Parameter Name="mode" Type="Java.Util.Locale+FilteringMode" />
       </Parameters>
       <Docs>
-        <param name="mode">To be added.</param>
         <param name="priorityList">user's Language Priority List in which each language
                 tag is sorted in descending order based on priority or weight</param>
         <param name="tags">language tags</param>
+        <param name="mode">To be added.</param>
         <summary>Returns a list of matching languages tags using the basic filtering
             mechanism defined in RFC 4647.</summary>
         <returns>a list of matching language tags sorted in descending order
@@ -1195,13 +1202,12 @@
       </Parameters>
       <Docs>
         <param name="locale">To be added.</param>
-        <summary>Returns a name for the locale's country that is appropriate for display to the
-            user.</summary>
+        <summary>Returns the name of this locale's country, localized to <c>locale</c>.</summary>
         <returns>The name of the country appropriate to the locale.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayCountry()" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayCountry()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayCountry(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayCountry(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -1237,13 +1243,12 @@
       </Parameters>
       <Docs>
         <param name="locale">To be added.</param>
-        <summary>Returns a name for the locale's language that is appropriate for display to the
-            user.</summary>
+        <summary>Returns the name of this locale's language, localized to <c>locale</c>.</summary>
         <returns>The name of the display language.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayLanguage()" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayLanguage()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayLanguage(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayLanguage(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -1279,13 +1284,13 @@
       </Parameters>
       <Docs>
         <param name="locale">To be added.</param>
-        <summary>Returns a name for the locale that is appropriate for display to the
-            user.</summary>
+        <summary>Returns this locale's language name, country name, and variant, localized
+            to <c>locale</c>.</summary>
         <returns>The name of the locale appropriate to display.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayName()" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayName()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayName(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayName(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -1320,15 +1325,15 @@
         <Parameter Name="inLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="inLocale">To be added.</param>
-        <summary>Returns a name for the the locale's script that is appropriate for display to
-            the user.</summary>
+        <param name="inLocale">The locale for which to retrieve the display script.</param>
+        <summary>Returns a name for the locale's script that is appropriate
+            for display to the user.</summary>
         <returns>the display name of the script code for the current default
-                <c>Locale.Category#DISPLAY DISPLAY</c> locale</returns>
+            <c>Locale.Category#DISPLAY DISPLAY</c> locale</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayScript()" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayScript()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayScript(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayScript(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -1362,14 +1367,14 @@
         <Parameter Name="inLocale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="inLocale">To be added.</param>
+        <param name="inLocale">The locale for which to retrieve the display variant code.</param>
         <summary>Returns a name for the locale's variant code that is appropriate for display to the
             user.</summary>
-        <returns>The name of the display variant code appropriate to the locale.</returns>
+        <returns>The name of the display variant code appropriate to the given locale.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayVariant()" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayVariant()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Locale#getDisplayVariant(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.Locale.getDisplayVariant(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/LongSummaryStatistics.xml b/docs/Mono.Android/en/Java.Util/LongSummaryStatistics.xml
index f4597e981c..0eeadccb27 100644
--- a/docs/Mono.Android/en/Java.Util/LongSummaryStatistics.xml
+++ b/docs/Mono.Android/en/Java.Util/LongSummaryStatistics.xml
@@ -171,11 +171,11 @@
       </Parameters>
       <Docs>
         <param name="value">the input value</param>
-        <summary>Records a new <c>int</c> value into the summary information.</summary>
+        <summary>Records a new <c>long</c> value into the summary information.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/LongSummaryStatistics#accept(int)" title="Reference documentation">Java documentation for <code>java.util.LongSummaryStatistics.accept(int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/LongSummaryStatistics#accept(long)" title="Reference documentation">Java documentation for <code>java.util.LongSummaryStatistics.accept(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Map.xml b/docs/Mono.Android/en/Java.Util/Map.xml
index e33a86b1eb..1a3fd2c281 100644
--- a/docs/Mono.Android/en/Java.Util/Map.xml
+++ b/docs/Mono.Android/en/Java.Util/Map.xml
@@ -109,8 +109,6 @@
         <Parameter Name="v" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="&lt;K&gt;&lt;K&gt;">the key's type</param>
-        <param name="&lt;V&gt;&lt;V&gt;">the value's type</param>
         <param name="k">the key</param>
         <param name="v">the value</param>
         <summary>Returns an immutable <c>Entry</c> containing the given key and value.</summary>
@@ -208,16 +206,16 @@
         <Parameter Name="v1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the mapping's key</param>
+        <param name="v1">the mapping's value</param>
+        <summary>Returns an immutable map containing a single mapping.</summary>
+        <returns>a <c>Map</c> containing the specified mapping</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -262,18 +260,18 @@
         <Parameter Name="v2" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <summary>Returns an immutable map containing two mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -320,20 +318,20 @@
         <Parameter Name="v3" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <summary>Returns an immutable map containing three mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -382,22 +380,22 @@
         <Parameter Name="v4" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <summary>Returns an immutable map containing four mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -448,24 +446,24 @@
         <Parameter Name="v5" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <summary>Returns an immutable map containing five mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -518,26 +516,26 @@
         <Parameter Name="v6" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <summary>Returns an immutable map containing six mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -592,28 +590,28 @@
         <Parameter Name="v7" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <summary>Returns an immutable map containing seven mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -670,30 +668,30 @@
         <Parameter Name="v8" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
-        <param name="k8">To be added.</param>
-        <param name="v8">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <param name="k8">the eighth mapping's key</param>
+        <param name="v8">the eighth mapping's value</param>
+        <summary>Returns an immutable map containing eight mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -752,32 +750,32 @@
         <Parameter Name="v9" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
-        <param name="k8">To be added.</param>
-        <param name="v8">To be added.</param>
-        <param name="k9">To be added.</param>
-        <param name="v9">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <param name="k8">the eighth mapping's key</param>
+        <param name="v8">the eighth mapping's value</param>
+        <param name="k9">the ninth mapping's key</param>
+        <param name="v9">the ninth mapping's value</param>
+        <summary>Returns an immutable map containing nine mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -838,34 +836,34 @@
         <Parameter Name="v10" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="k1">To be added.</param>
-        <param name="v1">To be added.</param>
-        <param name="k2">To be added.</param>
-        <param name="v2">To be added.</param>
-        <param name="k3">To be added.</param>
-        <param name="v3">To be added.</param>
-        <param name="k4">To be added.</param>
-        <param name="v4">To be added.</param>
-        <param name="k5">To be added.</param>
-        <param name="v5">To be added.</param>
-        <param name="k6">To be added.</param>
-        <param name="v6">To be added.</param>
-        <param name="k7">To be added.</param>
-        <param name="v7">To be added.</param>
-        <param name="k8">To be added.</param>
-        <param name="v8">To be added.</param>
-        <param name="k9">To be added.</param>
-        <param name="v9">To be added.</param>
-        <param name="k10">To be added.</param>
-        <param name="v10">To be added.</param>
         <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
         <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
-        <summary>Returns an immutable map containing zero mappings.</summary>
-        <returns>an empty <c>Map</c></returns>
+        <param name="k1">the first mapping's key</param>
+        <param name="v1">the first mapping's value</param>
+        <param name="k2">the second mapping's key</param>
+        <param name="v2">the second mapping's value</param>
+        <param name="k3">the third mapping's key</param>
+        <param name="v3">the third mapping's value</param>
+        <param name="k4">the fourth mapping's key</param>
+        <param name="v4">the fourth mapping's value</param>
+        <param name="k5">the fifth mapping's key</param>
+        <param name="v5">the fifth mapping's value</param>
+        <param name="k6">the sixth mapping's key</param>
+        <param name="v6">the sixth mapping's value</param>
+        <param name="k7">the seventh mapping's key</param>
+        <param name="v7">the seventh mapping's value</param>
+        <param name="k8">the eighth mapping's key</param>
+        <param name="v8">the eighth mapping's value</param>
+        <param name="k9">the ninth mapping's key</param>
+        <param name="v9">the ninth mapping's value</param>
+        <param name="k10">the tenth mapping's key</param>
+        <param name="v10">the tenth mapping's value</param>
+        <summary>Returns an immutable map containing ten mappings.</summary>
+        <returns>a <c>Map</c> containing the specified mappings</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Map#of()" title="Reference documentation">Java documentation for <code>java.util.Map.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Map#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Map.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -914,8 +912,6 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="&lt;K&gt;&lt;K&gt;">the <c>Map</c>'s key type</param>
-        <param name="&lt;V&gt;&lt;V&gt;">the <c>Map</c>'s value type</param>
         <param name="entries">
           <c>Map.Entry</c>s containing the keys and values from which the map is populated</param>
         <summary>Returns an immutable map containing keys and values extracted from the given entries.</summary>
diff --git a/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml b/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml
index 5f9c756413..b82c06a51e 100644
--- a/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml
+++ b/docs/Mono.Android/en/Java.Util/NoSuchElementException.xml
@@ -89,13 +89,14 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a &lt;code&gt;NoSuchElementException&lt;/code&gt; with <c>null</c>
-            as its error message string.</summary>
+        <param name="s">the detail message.</param>
+        <summary>Constructs a &lt;code&gt;NoSuchElementException&lt;/code&gt;, saving a reference
+            to the error message string <c>s</c> for later retrieval by the
+            <c>getMessage</c> method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/NoSuchElementException#NoSuchElementException()" title="Reference documentation">Java documentation for <code>java.util.NoSuchElementException.NoSuchElementException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/NoSuchElementException#NoSuchElementException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.NoSuchElementException.NoSuchElementException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Objects.xml b/docs/Mono.Android/en/Java.Util/Objects.xml
index bde4d8fb08..2bdd5ed672 100644
--- a/docs/Mono.Android/en/Java.Util/Objects.xml
+++ b/docs/Mono.Android/en/Java.Util/Objects.xml
@@ -591,16 +591,18 @@
         <Parameter Name="messageSupplier" Type="Java.Util.Functions.ISupplier" />
       </Parameters>
       <Docs>
-        <param name="messageSupplier">To be added.</param>
         <param name="obj">the object reference to check for nullity</param>
+        <param name="messageSupplier">supplier of the detail message to be
+            used in the event that a <c>NullPointerException</c> is thrown</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the reference</param>
-        <summary>Checks that the specified object reference is not <c>null</c>.</summary>
+        <summary>Checks that the specified object reference is not <c>null</c> and
+            throws a customized <c>NullPointerException</c> if it is.</summary>
         <returns>
           <c>obj</c> if not <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Objects#requireNonNull(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Objects.requireNonNull(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Objects#requireNonNull(java.lang.Object,%20java.util.function.Supplier)" title="Reference documentation">Java documentation for <code>java.util.Objects.requireNonNull(java.lang.Object, java.util.function.Supplier)</code>.</a>
             </format>
           </para>
           <para>
@@ -639,16 +641,17 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
         <param name="obj">the object reference to check for nullity</param>
+        <param name="message">detail message to be used in the event that a <c>NullPointerException</c> is thrown</param>
         <param name="&lt;T&gt;&lt;T&gt;">the type of the reference</param>
-        <summary>Checks that the specified object reference is not <c>null</c>.</summary>
+        <summary>Checks that the specified object reference is not <c>null</c> and
+            throws a customized <c>NullPointerException</c> if it is.</summary>
         <returns>
           <c>obj</c> if not <c>null</c></returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Objects#requireNonNull(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Objects.requireNonNull(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Objects#requireNonNull(java.lang.Object,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Objects.requireNonNull(java.lang.Object, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -885,14 +888,19 @@
         <Parameter Name="nullDefault" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="nullDefault">To be added.</param>
         <param name="o">an object</param>
-        <summary>Returns the result of calling <c>toString</c> for a non-<c>null</c> argument and <c>"null"</c> for a <c>null</c> argument.</summary>
-        <returns>the result of calling <c>toString</c> for a non-<c>null</c> argument and <c>"null"</c> for a <c>null</c> argument</returns>
+        <param name="nullDefault">string to return if the first argument is
+                   <c>null</c></param>
+        <summary>Returns the result of calling <c>toString</c> on the first
+            argument if the first argument is not <c>null</c> and returns
+            the second argument otherwise.</summary>
+        <returns>the result of calling <c>toString</c> on the first
+            argument if it is not <c>null</c> and the second argument
+            otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Objects#toString(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Objects.toString(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Objects#toString(java.lang.Object,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Objects.toString(java.lang.Object, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Observable.xml b/docs/Mono.Android/en/Java.Util/Observable.xml
index 17abdf8bcd..3c78f35af5 100644
--- a/docs/Mono.Android/en/Java.Util/Observable.xml
+++ b/docs/Mono.Android/en/Java.Util/Observable.xml
@@ -420,15 +420,15 @@
         <Parameter Name="arg" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="arg">To be added.</param>
+        <param name="arg">any object.</param>
         <summary>If this object has changed, as indicated by the
             &lt;code&gt;hasChanged&lt;/code&gt; method, then notify all of its observers
-            and then call the &lt;code&gt;clearChanged&lt;/code&gt; method to
-            indicate that this object has no longer changed.</summary>
+            and then call the &lt;code&gt;clearChanged&lt;/code&gt; method to indicate
+            that this object has no longer changed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Observable#notifyObservers()" title="Reference documentation">Java documentation for <code>java.util.Observable.notifyObservers()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Observable#notifyObservers(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Observable.notifyObservers(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/PriorityQueue.xml b/docs/Mono.Android/en/Java.Util/PriorityQueue.xml
index 861eed0fd1..deec1a2827 100644
--- a/docs/Mono.Android/en/Java.Util/PriorityQueue.xml
+++ b/docs/Mono.Android/en/Java.Util/PriorityQueue.xml
@@ -107,14 +107,15 @@
         <Parameter Name="comparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="comparator">To be added.</param>
-        <summary>Creates a <c>PriorityQueue</c> with the default initial
-            capacity (11) that orders its elements according to their
-            Comparable natural ordering.</summary>
+        <param name="comparator">the comparator that will be used to order this
+                    priority queue.  If <c>null</c>, the Comparable
+                    natural ordering of the elements will be used.</param>
+        <summary>Creates a <c>PriorityQueue</c> with the default initial capacity and
+            whose elements are ordered according to the specified comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue()" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue(java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue(java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -145,14 +146,14 @@
         <Parameter Name="c" Type="Java.Util.ISortedSet" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates a <c>PriorityQueue</c> with the default initial
-            capacity (11) that orders its elements according to their
-            Comparable natural ordering.</summary>
+        <param name="c">the sorted set whose elements are to be placed
+                    into this priority queue</param>
+        <summary>Creates a <c>PriorityQueue</c> containing the elements in the
+            specified sorted set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue()" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue(java.util.SortedSet)" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue(java.util.SortedSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -183,14 +184,14 @@
         <Parameter Name="c" Type="Java.Util.PriorityQueue" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates a <c>PriorityQueue</c> with the default initial
-            capacity (11) that orders its elements according to their
-            Comparable natural ordering.</summary>
+        <param name="c">the priority queue whose elements are to be placed
+                    into this priority queue</param>
+        <summary>Creates a <c>PriorityQueue</c> containing the elements in the
+            specified priority queue.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue()" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue(java.util.PriorityQueue)" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue(java.util.PriorityQueue)</code>.</a>
             </format>
           </para>
           <para>
@@ -221,14 +222,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Creates a <c>PriorityQueue</c> with the default initial
-            capacity (11) that orders its elements according to their
-            Comparable natural ordering.</summary>
+        <param name="c">the collection whose elements are to be placed
+                    into this priority queue</param>
+        <summary>Creates a <c>PriorityQueue</c> containing the elements in the
+            specified collection.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue()" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -259,14 +260,14 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Creates a <c>PriorityQueue</c> with the default initial
-            capacity (11) that orders its elements according to their
+        <param name="initialCapacity">the initial capacity for this priority queue</param>
+        <summary>Creates a <c>PriorityQueue</c> with the specified initial
+            capacity that orders its elements according to their
             Comparable natural ordering.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue()" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue(int)" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -301,15 +302,16 @@
         <Parameter Name="comparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="comparator">To be added.</param>
-        <summary>Creates a <c>PriorityQueue</c> with the default initial
-            capacity (11) that orders its elements according to their
-            Comparable natural ordering.</summary>
+        <param name="initialCapacity">the initial capacity for this priority queue</param>
+        <param name="comparator">the comparator that will be used to order this
+                    priority queue.  If <c>null</c>, the Comparable
+                    natural ordering of the elements will be used.</param>
+        <summary>Creates a <c>PriorityQueue</c> with the specified initial capacity
+            that orders its elements according to the specified comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue()" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/PriorityQueue#PriorityQueue(int,%20java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.PriorityQueue.PriorityQueue(int, java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Properties.xml b/docs/Mono.Android/en/Java.Util/Properties.xml
index fcaacae4ba..b5fc3772bf 100644
--- a/docs/Mono.Android/en/Java.Util/Properties.xml
+++ b/docs/Mono.Android/en/Java.Util/Properties.xml
@@ -88,12 +88,12 @@
         <Parameter Name="defaults" Type="Java.Util.Properties" />
       </Parameters>
       <Docs>
-        <param name="defaults">To be added.</param>
-        <summary>Creates an empty property list with no default values.</summary>
+        <param name="defaults">the defaults.</param>
+        <summary>Creates an empty property list with the specified defaults.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Properties#Properties()" title="Reference documentation">Java documentation for <code>java.util.Properties.Properties()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Properties#Properties(java.util.Properties)" title="Reference documentation">Java documentation for <code>java.util.Properties.Properties(java.util.Properties)</code>.</a>
             </format>
           </para>
           <para>
@@ -222,14 +222,14 @@
         <Parameter Name="defaultValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="defaultValue">the default value.</param>
-        <param name="key">the property key.</param>
+        <param name="key">the hashtable key.</param>
+        <param name="defaultValue">a default value.</param>
         <summary>Searches for the property with the specified key in this property list.</summary>
         <returns>the value in this property list with the specified key value.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Properties#getProperty(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Properties.getProperty(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Properties#getProperty(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Properties.getProperty(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -340,7 +340,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Properties#list(java.io.PrintStream)" title="Reference documentation">Java documentation for <code>java.util.Properties.list(java.io.PrintStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Properties#list(java.io.PrintWriter)" title="Reference documentation">Java documentation for <code>java.util.Properties.list(java.io.PrintWriter)</code>.</a>
             </format>
           </para>
           <para>
@@ -375,14 +375,13 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="reader">To be added.</param>
-        <param name="inStream">the input stream.</param>
+        <param name="reader">the input character stream.</param>
         <summary>Reads a property list (key and element pairs) from the input
-            byte stream.</summary>
+            character stream in a simple line-oriented format.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Properties#load(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.Properties.load(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Properties#load(java.io.Reader)" title="Reference documentation">Java documentation for <code>java.util.Properties.load(java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -642,17 +641,16 @@
         <Parameter Name="comments" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="writer">the <c>Writer</c></param>
-        <param name="out">an output stream.</param>
+        <param name="writer">an output character stream writer.</param>
         <param name="comments">a description of the property list.</param>
         <summary>Writes this property list (key and element pairs) in this
-            <c>Properties</c> table to the output stream in a format suitable
-            for loading into a <c>Properties</c> table using the
-            <c>#load(InputStream) load(InputStream)</c> method.</summary>
+            <c>Properties</c> table to the output character stream in a
+            format suitable for using the <c>#load(java.io.Reader) load(Reader)</c>
+            method.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Properties#store(java.io.OutputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Properties.store(java.io.OutputStream, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Properties#store(java.io.Writer,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Properties.store(java.io.Writer, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -787,17 +785,18 @@
         <Parameter Name="encoding" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="encoding">the code identifying the encoding that should be used to
-            write into the <c>OutputStream</c>.</param>
         <param name="os">the output stream on which to emit the XML document.</param>
         <param name="comment">a description of the property list, or <c>null</c>
-                   if no comment is desired.</param>
+                             if no comment is desired.</param>
+        <param name="encoding">the name of a supported
+                             &lt;a href="../lang/package-summary.html#charenc"&gt;
+                             character encoding&lt;/a&gt;</param>
         <summary>Emits an XML document representing all of the properties contained
-            in this table.</summary>
+            in this table, using the specified encoding.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Properties#storeToXML(java.io.OutputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Properties.storeToXML(java.io.OutputStream, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Properties#storeToXML(java.io.OutputStream,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Properties.storeToXML(java.io.OutputStream, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml b/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml
index af12d12661..44cfff1642 100644
--- a/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml
+++ b/docs/Mono.Android/en/Java.Util/PropertyResourceBundle.xml
@@ -56,15 +56,14 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="reader">To be added.</param>
-        <param name="stream">an InputStream that represents a property file
-                   to read from.</param>
-        <summary>Creates a property resource bundle from an <c>java.io.InputStream
-            InputStream</c>.</summary>
+        <param name="reader">a Reader that represents a property file to
+                   read from.</param>
+        <summary>Creates a property resource bundle from a <c>java.io.Reader
+            Reader</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/PropertyResourceBundle#PropertyResourceBundle(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.PropertyResourceBundle.PropertyResourceBundle(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/PropertyResourceBundle#PropertyResourceBundle(java.io.Reader)" title="Reference documentation">Java documentation for <code>java.util.PropertyResourceBundle.PropertyResourceBundle(java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Random.xml b/docs/Mono.Android/en/Java.Util/Random.xml
index 25adb202fb..05298be733 100644
--- a/docs/Mono.Android/en/Java.Util/Random.xml
+++ b/docs/Mono.Android/en/Java.Util/Random.xml
@@ -101,12 +101,12 @@
         <Parameter Name="seed" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="seed">To be added.</param>
-        <summary>Creates a new random number generator.</summary>
+        <param name="seed">the initial seed</param>
+        <summary>Creates a new random number generator using a single <c>long</c> seed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Random#Random()" title="Reference documentation">Java documentation for <code>java.util.Random.Random()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Random#Random(long)" title="Reference documentation">Java documentation for <code>java.util.Random.Random(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -490,15 +490,17 @@
         <Parameter Name="bound" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="bound">To be added.</param>
-        <summary>Returns the next pseudorandom, uniformly distributed <c>int</c>
-            value from this random number generator's sequence.</summary>
+        <param name="bound">the upper bound (exclusive).  Must be positive.</param>
+        <summary>Returns a pseudorandom, uniformly distributed <c>int</c> value
+            between 0 (inclusive) and the specified value (exclusive), drawn from
+            this random number generator's sequence.</summary>
         <returns>the next pseudorandom, uniformly distributed <c>int</c>
-                    value from this random number generator's sequence</returns>
+                    value between zero (inclusive) and <c>bound</c> (exclusive)
+                    from this random number generator's sequence</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Random#nextInt()" title="Reference documentation">Java documentation for <code>java.util.Random.nextInt()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Random#nextInt(int)" title="Reference documentation">Java documentation for <code>java.util.Random.nextInt(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ResourceBundle.xml b/docs/Mono.Android/en/Java.Util/ResourceBundle.xml
index 07d4e28f7b..223a80d984 100644
--- a/docs/Mono.Android/en/Java.Util/ResourceBundle.xml
+++ b/docs/Mono.Android/en/Java.Util/ResourceBundle.xml
@@ -188,13 +188,13 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="loader">To be added.</param>
+        <param name="loader">the class loader</param>
         <summary>Removes all resource bundles from the cache that have been loaded
-            using the caller's class loader.</summary>
+            using the given class loader.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ResourceBundle#clearCache()" title="Reference documentation">Java documentation for <code>java.util.ResourceBundle.clearCache()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ResourceBundle#clearCache(java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.util.ResourceBundle.clearCache(java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -318,15 +318,15 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">the <c>Locale</c>.</param>
         <param name="baseName">the base name of the resource bundle, a fully qualified class name</param>
-        <summary>Gets a resource bundle using the specified base name, the default locale,
+        <param name="locale">the locale for which a resource bundle is desired</param>
+        <summary>Gets a resource bundle using the specified base name and locale,
             and the caller's class loader.</summary>
-        <returns>a resource bundle for the given base name and the default locale</returns>
+        <returns>a resource bundle for the given base name and locale</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ResourceBundle#getBundle(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.ResourceBundle.getBundle(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ResourceBundle#getBundle(java.lang.String,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.ResourceBundle.getBundle(java.lang.String, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -364,8 +364,8 @@
         <Parameter Name="control" Type="Java.Util.ResourceBundle+Control" />
       </Parameters>
       <Docs>
-        <param name="control">the control that control the access sequence</param>
         <param name="baseName">the base name of the resource bundle, a fully qualified class name</param>
+        <param name="control">the control that control the access sequence</param>
         <summary>Gets a resource bundle using the specified base name, the default locale,
             and the caller's class loader.</summary>
         <returns>a resource bundle for the given base name and the default locale</returns>
@@ -409,16 +409,16 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="locale">the <c>Locale</c>.</param>
-        <param name="loader">the <c>ClassLoader</c> to use.</param>
         <param name="baseName">the base name of the resource bundle, a fully qualified class name</param>
-        <summary>Gets a resource bundle using the specified base name, the default locale,
-            and the caller's class loader.</summary>
-        <returns>a resource bundle for the given base name and the default locale</returns>
+        <param name="locale">the locale for which a resource bundle is desired</param>
+        <param name="loader">the class loader from which to load the resource bundle</param>
+        <summary>Gets a resource bundle using the specified base name, locale, and class
+            loader.</summary>
+        <returns>a resource bundle for the given base name and locale</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ResourceBundle#getBundle(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.ResourceBundle.getBundle(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ResourceBundle#getBundle(java.lang.String,%20java.util.Locale,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.util.ResourceBundle.getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -457,9 +457,9 @@
         <Parameter Name="control" Type="Java.Util.ResourceBundle+Control" />
       </Parameters>
       <Docs>
+        <param name="baseName">the base name of the resource bundle, a fully qualified class name</param>
         <param name="targetLocale">the target locale of the resource bundle</param>
         <param name="control">the control that control the access sequence</param>
-        <param name="baseName">the base name of the resource bundle, a fully qualified class name</param>
         <summary>Gets a resource bundle using the specified base name, the default locale,
             and the caller's class loader.</summary>
         <returns>a resource bundle for the given base name and the default locale</returns>
@@ -504,10 +504,10 @@
         <Parameter Name="control" Type="Java.Util.ResourceBundle+Control" />
       </Parameters>
       <Docs>
+        <param name="baseName">the base name of the resource bundle, a fully qualified class name</param>
         <param name="targetLocale">the target locale of the resource bundle</param>
         <param name="loader">the class loader to load resource</param>
         <param name="control">the control that control the access sequence</param>
-        <param name="baseName">the base name of the resource bundle, a fully qualified class name</param>
         <summary>Gets a resource bundle using the specified base name, the default locale,
             and the caller's class loader.</summary>
         <returns>a resource bundle for the given base name and the default locale</returns>
diff --git a/docs/Mono.Android/en/Java.Util/Scanner.xml b/docs/Mono.Android/en/Java.Util/Scanner.xml
index 2452f72750..3835b083cc 100644
--- a/docs/Mono.Android/en/Java.Util/Scanner.xml
+++ b/docs/Mono.Android/en/Java.Util/Scanner.xml
@@ -111,13 +111,14 @@
         <Parameter Name="source" Type="Java.Lang.IReadable" />
       </Parameters>
       <Docs>
-        <param name="source">A file to be scanned</param>
+        <param name="source">A character source implementing the <c>Readable</c>
+                    interface</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
-            from the specified file.</summary>
+            from the specified source.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.lang.Readable)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.lang.Readable)</code>.</a>
             </format>
           </para>
           <para>
@@ -149,13 +150,13 @@
         <Parameter Name="source" Type="Java.Nio.Channels.IReadableByteChannel" />
       </Parameters>
       <Docs>
-        <param name="source">A file to be scanned</param>
+        <param name="source">A channel to scan</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
-            from the specified file.</summary>
+            from the specified channel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.nio.channels.ReadableByteChannel)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.nio.channels.ReadableByteChannel)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,13 +188,13 @@
         <Parameter Name="source" Type="Java.Nio.FileNio.IPath" />
       </Parameters>
       <Docs>
-        <param name="source">A file to be scanned</param>
+        <param name="source">the path to the file to be scanned</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
             from the specified file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.nio.file.Path)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.nio.file.Path)</code>.</a>
             </format>
           </para>
           <para>
@@ -224,13 +225,13 @@
         <Parameter Name="source" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="source">A file to be scanned</param>
+        <param name="source">An input stream to be scanned</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
-            from the specified file.</summary>
+            from the specified input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.InputStream)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -262,13 +263,13 @@
         <Parameter Name="source" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="source">A file to be scanned</param>
+        <param name="source">A string to scan</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
-            from the specified file.</summary>
+            from the specified string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -301,14 +302,15 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">To be added.</param>
         <param name="source">A file to be scanned</param>
+        <param name="charsetName">The encoding type used to convert bytes from the file
+                   into characters to be scanned</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
             from the specified file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -344,14 +346,15 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">To be added.</param>
-        <param name="source">A file to be scanned</param>
+        <param name="source">A channel to scan</param>
+        <param name="charsetName">The encoding type used to convert bytes from the
+                   channel into characters to be scanned</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
-            from the specified file.</summary>
+            from the specified channel.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.nio.channels.ReadableByteChannel,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.nio.channels.ReadableByteChannel, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -386,14 +389,15 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">To be added.</param>
-        <param name="source">A file to be scanned</param>
+        <param name="source">the path to the file to be scanned</param>
+        <param name="charsetName">The encoding type used to convert bytes from the file
+                     into characters to be scanned</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
             from the specified file.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.nio.file.Path,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.nio.file.Path, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -425,14 +429,15 @@
         <Parameter Name="charsetName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="charsetName">To be added.</param>
-        <param name="source">A file to be scanned</param>
+        <param name="source">An input stream to be scanned</param>
+        <param name="charsetName">The encoding type used to convert bytes from the
+                   stream into characters to be scanned</param>
         <summary>Constructs a new &lt;code&gt;Scanner&lt;/code&gt; that produces values scanned
-            from the specified file.</summary>
+            from the specified input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.File)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#Scanner(java.io.InputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.Scanner(java.io.InputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -549,14 +554,14 @@
         <Parameter Name="pattern" Type="Java.Util.Regex.Pattern" />
       </Parameters>
       <Docs>
-        <param name="pattern">a string specifying the pattern to search for</param>
-        <summary>Attempts to find the next occurrence of a pattern constructed from the
-            specified string, ignoring delimiters.</summary>
+        <param name="pattern">the pattern to scan for</param>
+        <summary>Attempts to find the next occurrence of the specified pattern ignoring
+            delimiters.</summary>
         <returns>the text that matched the specified pattern</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#findInLine(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.findInLine(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#findInLine(java.util.regex.Pattern)" title="Reference documentation">Java documentation for <code>java.util.Scanner.findInLine(java.util.regex.Pattern)</code>.</a>
             </format>
           </para>
           <para>
@@ -638,15 +643,14 @@
         <Parameter Name="horizon" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="pattern">a string specifying the pattern to search for</param>
+        <param name="pattern">the pattern to scan for</param>
         <param name="horizon">the search horizon</param>
-        <summary>Attempts to find the next occurrence of a pattern constructed from the
-            specified string, ignoring delimiters.</summary>
+        <summary>Attempts to find the next occurrence of the specified pattern.</summary>
         <returns>the text that matched the specified pattern</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#findWithinHorizon(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.findWithinHorizon(java.lang.String, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#findWithinHorizon(java.util.regex.Pattern,%20int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.findWithinHorizon(java.util.regex.Pattern, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1190,13 +1194,14 @@
         <Parameter Name="pattern" Type="Java.Util.Regex.Pattern" />
       </Parameters>
       <Docs>
-        <param name="pattern">the pattern to check for.</param>
-        <summary>Returns true if this scanner has another token in its input.</summary>
-        <returns>true if and only if this scanner has another token</returns>
+        <param name="pattern">the pattern to scan for</param>
+        <summary>Returns true if the next complete token matches the specified pattern.</summary>
+        <returns>true if and only if this scanner has another token matching
+                    the specified pattern</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#hasNext()" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNext()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#hasNext(java.util.regex.Pattern)" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNext(java.util.regex.Pattern)</code>.</a>
             </format>
           </para>
           <para>
@@ -1233,13 +1238,15 @@
         <Parameter Name="pattern" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pattern">the string specifying the pattern to scan for</param>
-        <summary>Returns true if this scanner has another token in its input.</summary>
-        <returns>true if and only if this scanner has another token</returns>
+        <param name="pattern">a string specifying the pattern to scan</param>
+        <summary>Returns true if the next token matches the pattern constructed from the
+            specified string.</summary>
+        <returns>true if and only if this scanner has another token matching
+                    the specified pattern</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#hasNext()" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNext()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#hasNext(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNext(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1276,17 +1283,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into a
-            <c>BigInteger</c>.</param>
+        <param name="radix">the radix used to interpret the token as an integer</param>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as a &lt;code&gt;BigInteger&lt;/code&gt; in the default radix using the
-            <c>#nextBigInteger</c> method.</summary>
+            interpreted as a &lt;code&gt;BigInteger&lt;/code&gt; in the specified radix using
+            the <c>#nextBigInteger</c> method.</summary>
         <returns>true if and only if this scanner's next token is a valid
                     &lt;code&gt;BigInteger&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextBigInteger()" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextBigInteger()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextBigInteger(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextBigInteger(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1323,17 +1329,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into a <c>byte</c>
-            value</param>
+        <param name="radix">the radix used to interpret the token as a byte value</param>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as a byte value in the default radix using the
+            interpreted as a byte value in the specified radix using the
             <c>#nextByte</c> method.</summary>
         <returns>true if and only if this scanner's next token is a valid
                     byte value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextByte()" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextByte()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextByte(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextByte(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1370,17 +1375,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into an <c>int</c>
-            value.</param>
+        <param name="radix">the radix used to interpret the token as an int value</param>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as an int value in the default radix using the
+            interpreted as an int value in the specified radix using the
             <c>#nextInt</c> method.</summary>
         <returns>true if and only if this scanner's next token is a valid
                     int value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextInt()" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextInt()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextInt(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextInt(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1417,17 +1421,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into a <c>long</c>
-            value.</param>
+        <param name="radix">the radix used to interpret the token as a long value</param>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as a long value in the default radix using the
+            interpreted as a long value in the specified radix using the
             <c>#nextLong</c> method.</summary>
         <returns>true if and only if this scanner's next token is a valid
                     long value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextLong()" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextLong(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextLong(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1464,17 +1467,16 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into a <c>short</c>
-            value.</param>
+        <param name="radix">the radix used to interpret the token as a short value</param>
         <summary>Returns true if the next token in this scanner's input can be
-            interpreted as a short value in the default radix using the
+            interpreted as a short value in the specified radix using the
             <c>#nextShort</c> method.</summary>
         <returns>true if and only if this scanner's next token is a valid
-                    short value in the default radix</returns>
+                    short value in the specified radix</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextShort()" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextShort()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#hasNextShort(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.hasNextShort(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1730,13 +1732,13 @@
         <Parameter Name="pattern" Type="Java.Util.Regex.Pattern" />
       </Parameters>
       <Docs>
-        <param name="pattern">the specified pattern to scan.</param>
-        <summary>Finds and returns the next complete token from this scanner.</summary>
+        <param name="pattern">the pattern to scan for</param>
+        <summary>Returns the next token if it matches the specified pattern.</summary>
         <returns>the next token</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#next()" title="Reference documentation">Java documentation for <code>java.util.Scanner.next()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#next(java.util.regex.Pattern)" title="Reference documentation">Java documentation for <code>java.util.Scanner.next(java.util.regex.Pattern)</code>.</a>
             </format>
           </para>
           <para>
@@ -1775,13 +1777,14 @@
         <Parameter Name="pattern" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="pattern">the string specifying the pattern to scan for.</param>
-        <summary>Finds and returns the next complete token from this scanner.</summary>
+        <param name="pattern">a string specifying the pattern to scan</param>
+        <summary>Returns the next token if it matches the pattern constructed from the
+            specified string.</summary>
         <returns>the next token</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#next()" title="Reference documentation">Java documentation for <code>java.util.Scanner.next()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#next(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.next(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1908,15 +1911,14 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into a
-            <c>BigInteger</c>.</param>
+        <param name="radix">the radix used to interpret the token</param>
         <summary>Scans the next token of the input as a <c>java.math.BigInteger
             BigInteger</c>.</summary>
         <returns>the <c>BigInteger</c> scanned from the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#nextBigInteger()" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextBigInteger()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#nextBigInteger(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextBigInteger(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2043,13 +2045,13 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into <c>byte</c> value.</param>
+        <param name="radix">the radix used to interpret the token as a byte value</param>
         <summary>Scans the next token of the input as a <c>byte</c>.</summary>
         <returns>the <c>byte</c> scanned from the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#nextByte()" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextByte()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#nextByte(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextByte(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2218,14 +2220,13 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into an <c>int</c>
-            value.</param>
+        <param name="radix">the radix used to interpret the token as an int value</param>
         <summary>Scans the next token of the input as an <c>int</c>.</summary>
         <returns>the <c>int</c> scanned from the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#nextInt()" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextInt()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#nextInt(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextInt(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2350,14 +2351,13 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into a <c>long</c>
-            value.</param>
+        <param name="radix">the radix used to interpret the token as an int value</param>
         <summary>Scans the next token of the input as a <c>long</c>.</summary>
         <returns>the <c>long</c> scanned from the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#nextLong()" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#nextLong(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextLong(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2440,14 +2440,13 @@
         <Parameter Name="radix" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="radix">the radix used to translate the token into <c>short</c>
-            value.</param>
+        <param name="radix">the radix used to interpret the token as a short value</param>
         <summary>Scans the next token of the input as a <c>short</c>.</summary>
         <returns>the <c>short</c> scanned from the input</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#nextShort()" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextShort()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#nextShort(int)" title="Reference documentation">Java documentation for <code>java.util.Scanner.nextShort(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2607,13 +2606,12 @@
       </Parameters>
       <Docs>
         <param name="pattern">a string specifying the pattern to skip over</param>
-        <summary>Skips input that matches a pattern constructed from the specified
-            string.</summary>
+        <summary>Skips input that matches the specified pattern, ignoring delimiters.</summary>
         <returns>this scanner</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#skip(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.skip(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#skip(java.util.regex.Pattern)" title="Reference documentation">Java documentation for <code>java.util.Scanner.skip(java.util.regex.Pattern)</code>.</a>
             </format>
           </para>
           <para>
@@ -2757,14 +2755,13 @@
         <Parameter Name="pattern" Type="Java.Util.Regex.Pattern" />
       </Parameters>
       <Docs>
-        <param name="pattern">A string specifying a delimiting pattern</param>
-        <summary>Sets this scanner's delimiting pattern to a pattern constructed from
-            the specified &lt;code&gt;String&lt;/code&gt;.</summary>
+        <param name="pattern">A delimiting pattern</param>
+        <summary>Sets this scanner's delimiting pattern to the specified pattern.</summary>
         <returns>this scanner</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Scanner#useDelimiter(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Scanner.useDelimiter(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Scanner#useDelimiter(java.util.regex.Pattern)" title="Reference documentation">Java documentation for <code>java.util.Scanner.useDelimiter(java.util.regex.Pattern)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ServiceConfigurationError.xml b/docs/Mono.Android/en/Java.Util/ServiceConfigurationError.xml
index 8d1c72e4ea..42876169b8 100644
--- a/docs/Mono.Android/en/Java.Util/ServiceConfigurationError.xml
+++ b/docs/Mono.Android/en/Java.Util/ServiceConfigurationError.xml
@@ -115,13 +115,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
         <param name="msg">The message, or <c>null</c> if there is no message</param>
-        <summary>Constructs a new instance with the specified message.</summary>
+        <param name="cause">The cause, or <c>null</c> if the cause is nonexistent
+                           or unknown</param>
+        <summary>Constructs a new instance with the specified message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ServiceConfigurationError#ServiceConfigurationError(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.ServiceConfigurationError.ServiceConfigurationError(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ServiceConfigurationError#ServiceConfigurationError(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>java.util.ServiceConfigurationError.ServiceConfigurationError(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/ServiceLoader.xml b/docs/Mono.Android/en/Java.Util/ServiceLoader.xml
index 245757ba85..c0ade28f48 100644
--- a/docs/Mono.Android/en/Java.Util/ServiceLoader.xml
+++ b/docs/Mono.Android/en/Java.Util/ServiceLoader.xml
@@ -202,16 +202,19 @@
         <Parameter Name="loader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="loader">To be added.</param>
         <param name="&lt;S&gt;&lt;S&gt;">the class of the service type</param>
         <param name="service">The interface or abstract class representing the service</param>
-        <summary>Creates a new service loader for the given service type, using the
-            current thread's java.</summary>
+        <param name="loader">The class loader to be used to load provider-configuration files
+                    and provider classes, or <c>null</c> if the system class
+                    loader (or, failing that, the bootstrap class loader) is to be
+                    used</param>
+        <summary>Creates a new service loader for the given service type and class
+            loader.</summary>
         <returns>A new service loader</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/ServiceLoader#load(java.lang.Class)" title="Reference documentation">Java documentation for <code>java.util.ServiceLoader.load(java.lang.Class)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/ServiceLoader#load(java.lang.Class,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>java.util.ServiceLoader.load(java.lang.Class, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Set.xml b/docs/Mono.Android/en/Java.Util/Set.xml
index c1f98c3d5c..c7185feae2 100644
--- a/docs/Mono.Android/en/Java.Util/Set.xml
+++ b/docs/Mono.Android/en/Java.Util/Set.xml
@@ -153,14 +153,14 @@
         <Parameter Name="e1" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the single element</param>
+        <summary>Returns an immutable set containing one element.</summary>
+        <returns>a <c>Set</c> containing the specified element</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -209,14 +209,14 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="elements">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="elements">the elements to be contained in the set</param>
+        <summary>Returns an immutable set containing an arbitrary number of elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object[])" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object[])</code>.</a>
             </format>
           </para>
           <para>
@@ -259,15 +259,15 @@
         <Parameter Name="e2" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <summary>Returns an immutable set containing two elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -311,16 +311,16 @@
         <Parameter Name="e3" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <summary>Returns an immutable set containing three elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -365,17 +365,17 @@
         <Parameter Name="e4" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <summary>Returns an immutable set containing four elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -421,18 +421,18 @@
         <Parameter Name="e5" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <summary>Returns an immutable set containing five elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -479,19 +479,19 @@
         <Parameter Name="e6" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <summary>Returns an immutable set containing six elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -539,20 +539,20 @@
         <Parameter Name="e7" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <summary>Returns an immutable set containing seven elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -601,21 +601,21 @@
         <Parameter Name="e8" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <summary>Returns an immutable set containing eight elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -665,22 +665,22 @@
         <Parameter Name="e9" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <summary>Returns an immutable set containing nine elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -731,23 +731,23 @@
         <Parameter Name="e10" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="e1">To be added.</param>
-        <param name="e2">To be added.</param>
-        <param name="e3">To be added.</param>
-        <param name="e4">To be added.</param>
-        <param name="e5">To be added.</param>
-        <param name="e6">To be added.</param>
-        <param name="e7">To be added.</param>
-        <param name="e8">To be added.</param>
-        <param name="e9">To be added.</param>
-        <param name="e10">To be added.</param>
         <param name="&lt;E&gt;&lt;E&gt;">the <c>Set</c>'s element type</param>
-        <summary>Returns an immutable set containing zero elements.</summary>
-        <returns>an empty <c>Set</c></returns>
+        <param name="e1">the first element</param>
+        <param name="e2">the second element</param>
+        <param name="e3">the third element</param>
+        <param name="e4">the fourth element</param>
+        <param name="e5">the fifth element</param>
+        <param name="e6">the sixth element</param>
+        <param name="e7">the seventh element</param>
+        <param name="e8">the eighth element</param>
+        <param name="e9">the ninth element</param>
+        <param name="e10">the tenth element</param>
+        <summary>Returns an immutable set containing ten elements.</summary>
+        <returns>a <c>Set</c> containing the specified elements</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Set#of()" title="Reference documentation">Java documentation for <code>java.util.Set.of()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Set#of(java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Set.of(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml b/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml
index b626b9f30e..6cac1cd925 100644
--- a/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml
+++ b/docs/Mono.Android/en/Java.Util/SimpleTimeZone.xml
@@ -127,22 +127,35 @@
         <Parameter Name="endTime" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="startMonth">To be added.</param>
-        <param name="startDay">To be added.</param>
-        <param name="startDayOfWeek">To be added.</param>
-        <param name="startTime">To be added.</param>
-        <param name="endMonth">To be added.</param>
-        <param name="endDay">To be added.</param>
-        <param name="endDayOfWeek">To be added.</param>
-        <param name="endTime">To be added.</param>
-        <param name="rawOffset">The base time zone offset in milliseconds to GMT.</param>
-        <param name="ID">The time zone name that is given to this instance.</param>
-        <summary>Constructs a SimpleTimeZone with the given base time zone offset from GMT
-            and time zone ID with no daylight saving time schedule.</summary>
+        <param name="rawOffset">The given base time zone offset from GMT.</param>
+        <param name="ID">The time zone ID which is given to this object.</param>
+        <param name="startMonth">The daylight saving time starting month. Month is
+                                   a <c>Calendar#MONTH MONTH</c> field value (0-based. e.g., 0
+                                   for January).</param>
+        <param name="startDay">The day of the month on which the daylight saving time starts.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="startDayOfWeek">The daylight saving time starting day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="startTime">The daylight saving time starting time in local wall clock
+                                   time (in milliseconds within the day), which is local
+                                   standard time in this case.</param>
+        <param name="endMonth">The daylight saving time ending month. Month is
+                                   a <c>Calendar#MONTH MONTH</c> field
+                                   value (0-based. e.g., 9 for October).</param>
+        <param name="endDay">The day of the month on which the daylight saving time ends.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="endDayOfWeek">The daylight saving time ending day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="endTime">The daylight saving ending time in local wall clock time,
+                                   (in milliseconds within the day) which is local daylight
+                                   time in this case.</param>
+        <summary>Constructs a SimpleTimeZone with the given base time zone offset from
+            GMT, time zone ID, and rules for starting and ending the daylight
+            time.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#SimpleTimeZone(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.SimpleTimeZone(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#SimpleTimeZone(int,%20java.lang.String,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.SimpleTimeZone(int, java.lang.String, int, int, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,23 +200,35 @@
         <Parameter Name="dstSavings" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="startMonth">To be added.</param>
-        <param name="startDay">To be added.</param>
-        <param name="startDayOfWeek">To be added.</param>
-        <param name="startTime">To be added.</param>
-        <param name="endMonth">To be added.</param>
-        <param name="endDay">To be added.</param>
-        <param name="endDayOfWeek">To be added.</param>
-        <param name="endTime">To be added.</param>
-        <param name="dstSavings">To be added.</param>
-        <param name="rawOffset">The base time zone offset in milliseconds to GMT.</param>
-        <param name="ID">The time zone name that is given to this instance.</param>
-        <summary>Constructs a SimpleTimeZone with the given base time zone offset from GMT
-            and time zone ID with no daylight saving time schedule.</summary>
+        <param name="rawOffset">The given base time zone offset from GMT.</param>
+        <param name="ID">The time zone ID which is given to this object.</param>
+        <param name="startMonth">The daylight saving time starting month. Month is
+                                   a <c>Calendar#MONTH MONTH</c> field
+                                   value (0-based. e.g., 0 for January).</param>
+        <param name="startDay">The day of the month on which the daylight saving time starts.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="startDayOfWeek">The daylight saving time starting day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="startTime">The daylight saving time starting time in local wall clock
+                                   time, which is local standard time in this case.</param>
+        <param name="endMonth">The daylight saving time ending month. Month is
+                                   a <c>Calendar#MONTH MONTH</c> field
+                                   value (0-based. e.g., 9 for October).</param>
+        <param name="endDay">The day of the month on which the daylight saving time ends.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="endDayOfWeek">The daylight saving time ending day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="endTime">The daylight saving ending time in local wall clock time,
+                                   which is local daylight time in this case.</param>
+        <param name="dstSavings">The amount of time in milliseconds saved during
+                                   daylight saving time.</param>
+        <summary>Constructs a SimpleTimeZone with the given base time zone offset from
+            GMT, time zone ID, and rules for starting and ending the daylight
+            time.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#SimpleTimeZone(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.SimpleTimeZone(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#SimpleTimeZone(int,%20java.lang.String,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.SimpleTimeZone(int, java.lang.String, int, int, int, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -250,25 +275,37 @@
         <Parameter Name="dstSavings" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="startMonth">To be added.</param>
-        <param name="startDay">To be added.</param>
-        <param name="startDayOfWeek">To be added.</param>
-        <param name="startTime">To be added.</param>
-        <param name="startTimeMode">To be added.</param>
-        <param name="endMonth">To be added.</param>
-        <param name="endDay">To be added.</param>
-        <param name="endDayOfWeek">To be added.</param>
-        <param name="endTime">To be added.</param>
-        <param name="endTimeMode">To be added.</param>
-        <param name="dstSavings">To be added.</param>
-        <param name="rawOffset">The base time zone offset in milliseconds to GMT.</param>
-        <param name="ID">The time zone name that is given to this instance.</param>
-        <summary>Constructs a SimpleTimeZone with the given base time zone offset from GMT
-            and time zone ID with no daylight saving time schedule.</summary>
+        <param name="rawOffset">The given base time zone offset from GMT.</param>
+        <param name="ID">The time zone ID which is given to this object.</param>
+        <param name="startMonth">The daylight saving time starting month. Month is
+                                   a <c>Calendar#MONTH MONTH</c> field
+                                   value (0-based. e.g., 0 for January).</param>
+        <param name="startDay">The day of the month on which the daylight saving time starts.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="startDayOfWeek">The daylight saving time starting day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="startTime">The daylight saving time starting time in the time mode
+                                   specified by &lt;code&gt;startTimeMode&lt;/code&gt;.</param>
+        <param name="startTimeMode">The mode of the start time specified by startTime.</param>
+        <param name="endMonth">The daylight saving time ending month. Month is
+                                   a <c>Calendar#MONTH MONTH</c> field
+                                   value (0-based. e.g., 9 for October).</param>
+        <param name="endDay">The day of the month on which the daylight saving time ends.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="endDayOfWeek">The daylight saving time ending day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="endTime">The daylight saving ending time in time time mode
+                                   specified by &lt;code&gt;endTimeMode&lt;/code&gt;.</param>
+        <param name="endTimeMode">The mode of the end time specified by endTime</param>
+        <param name="dstSavings">The amount of time in milliseconds saved during
+                                   daylight saving time.</param>
+        <summary>Constructs a SimpleTimeZone with the given base time zone offset from
+            GMT, time zone ID, and rules for starting and ending the daylight
+            time.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#SimpleTimeZone(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.SimpleTimeZone(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#SimpleTimeZone(int,%20java.lang.String,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.SimpleTimeZone(int, java.lang.String, int, int, int, int, int, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -575,19 +612,21 @@
         <Parameter Name="endTime" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="endDayOfWeek">To be added.</param>
         <param name="endMonth">The daylight saving time ending month. Month is
                                    a <c>Calendar#MONTH MONTH</c> field
                                    value (0-based. e.g., 9 for October).</param>
-        <param name="endDay">The day of the month on which the daylight saving time ends.</param>
+        <param name="endDay">The day of the month on which the daylight saving time ends.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="endDayOfWeek">The daylight saving time ending day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
         <param name="endTime">The daylight saving ending time in local wall clock time,
                                    (in milliseconds within the day) which is local daylight
                                    time in this case.</param>
-        <summary>Sets the daylight saving time end rule to a fixed date within a month.</summary>
+        <summary>Sets the daylight saving time end rule.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setEndRule(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setEndRule(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setEndRule(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setEndRule(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -626,21 +665,24 @@
         <Parameter Name="after" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="endDayOfWeek">To be added.</param>
-        <param name="after">selects the day after or before the day of month.
-</param>
         <param name="endMonth">The daylight saving time ending month. Month is
                                    a <c>Calendar#MONTH MONTH</c> field
                                    value (0-based. e.g., 9 for October).</param>
         <param name="endDay">The day of the month on which the daylight saving time ends.</param>
+        <param name="endDayOfWeek">The daylight saving time ending day-of-week.</param>
         <param name="endTime">The daylight saving ending time in local wall clock time,
                                    (in milliseconds within the day) which is local daylight
                                    time in this case.</param>
-        <summary>Sets the daylight saving time end rule to a fixed date within a month.</summary>
+        <param name="after">If true, this rule selects the first &lt;code&gt;endDayOfWeek&lt;/code&gt; on
+                                   or &lt;em&gt;after&lt;/em&gt; &lt;code&gt;endDay&lt;/code&gt;.  If false, this rule
+                                   selects the last &lt;code&gt;endDayOfWeek&lt;/code&gt; on or before
+                                   &lt;code&gt;endDay&lt;/code&gt; of the month.</param>
+        <summary>Sets the daylight saving time end rule to a weekday before or after the given date within
+            a month, e.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setEndRule(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setEndRule(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setEndRule(int,%20int,%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setEndRule(int, int, int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -726,19 +768,20 @@
         <Parameter Name="startTime" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="startDayOfWeek">To be added.</param>
         <param name="startMonth">The daylight saving time starting month. Month is
                                    a <c>Calendar#MONTH MONTH</c> field
                                    value (0-based. e.g., 0 for January).</param>
-        <param name="startDay">The day of the month on which the daylight saving time starts.</param>
-        <param name="startTime">The daylight saving time starting time in local wall clock
-                                   time, which is local standard time in this case.
+        <param name="startDay">The day of the month on which the daylight saving time starts.
                                    See the class description for the special cases of this parameter.</param>
-        <summary>Sets the daylight saving time start rule to a fixed date within a month.</summary>
+        <param name="startDayOfWeek">The daylight saving time starting day-of-week.
+                                   See the class description for the special cases of this parameter.</param>
+        <param name="startTime">The daylight saving time starting time in local wall clock
+                                   time, which is local standard time in this case.</param>
+        <summary>Sets the daylight saving time start rule.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setStartRule(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setStartRule(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setStartRule(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setStartRule(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -777,21 +820,23 @@
         <Parameter Name="after" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="startDayOfWeek">To be added.</param>
-        <param name="after">selects the day after or before the day of month.
-</param>
         <param name="startMonth">The daylight saving time starting month. Month is
                                    a <c>Calendar#MONTH MONTH</c> field
                                    value (0-based. e.g., 0 for January).</param>
         <param name="startDay">The day of the month on which the daylight saving time starts.</param>
+        <param name="startDayOfWeek">The daylight saving time starting day-of-week.</param>
         <param name="startTime">The daylight saving time starting time in local wall clock
-                                   time, which is local standard time in this case.
-                                   See the class description for the special cases of this parameter.</param>
-        <summary>Sets the daylight saving time start rule to a fixed date within a month.</summary>
+                                   time, which is local standard time in this case.</param>
+        <param name="after">If true, this rule selects the first &lt;code&gt;dayOfWeek&lt;/code&gt; on or
+                                   &lt;em&gt;after&lt;/em&gt; &lt;code&gt;dayOfMonth&lt;/code&gt;.  If false, this rule
+                                   selects the last &lt;code&gt;dayOfWeek&lt;/code&gt; on or &lt;em&gt;before&lt;/em&gt;
+                                   &lt;code&gt;dayOfMonth&lt;/code&gt;.</param>
+        <summary>Sets the daylight saving time start rule to a weekday before or after the given date within
+            a month, e.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setStartRule(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setStartRule(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SimpleTimeZone#setStartRule(int,%20int,%20int,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.SimpleTimeZone.setStartRule(int, int, int, int, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Spliterators.xml b/docs/Mono.Android/en/Java.Util/Spliterators.xml
index a50cdb81aa..781ba114a7 100644
--- a/docs/Mono.Android/en/Java.Util/Spliterators.xml
+++ b/docs/Mono.Android/en/Java.Util/Spliterators.xml
@@ -105,14 +105,14 @@
         <Parameter Name="spliterator" Type="Java.Util.ISpliterator" />
       </Parameters>
       <Docs>
+        <param name="&lt;T&gt;&lt;T&gt;">Type of elements</param>
         <param name="spliterator">The spliterator</param>
-        <summary>Creates an <c>PrimitiveIterator.OfDouble</c> from a
-            <c>Spliterator.OfDouble</c>.</summary>
+        <summary>Creates an <c>Iterator</c> from a <c>Spliterator</c>.</summary>
         <returns>An iterator</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Spliterators#iterator(java.util.OfDouble)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.iterator(java.util.OfDouble)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Spliterators#iterator(java.util.Spliterator)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.iterator(java.util.Spliterator)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,21 +189,18 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
-        <param name="additionalCharacteristics">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">Type of elements</param>
-        <param name="c">The collection</param>
-        <param name="characteristics">Characteristics of this spliterator's source or
-                   elements.  The characteristics <c>SIZED</c> and <c>SUBSIZED</c>
-                   are additionally reported unless <c>CONCURRENT</c> is supplied.</param>
-        <summary>Creates a <c>Spliterator</c> using the given collection's
-            <c>java.util.Collection#iterator()</c> as the source of elements, and
-            reporting its <c>java.util.Collection#size()</c> as its initial size.</summary>
-        <returns>A spliterator from an iterator</returns>
+        <param name="array">The array, assumed to be unmodified during use</param>
+        <param name="additionalCharacteristics">Additional spliterator characteristics
+                   of this spliterator's source or elements beyond <c>SIZED</c> and
+                   <c>SUBSIZED</c> which are are always reported</param>
+        <summary>Creates a <c>Spliterator</c> covering the elements of a given array,
+            using a customized set of spliterator characteristics.</summary>
+        <returns>A spliterator for an array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Spliterators#spliterator(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.spliterator(java.util.Collection, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Spliterators#spliterator(java.lang.Object[],%20int)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.spliterator(java.lang.Object[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -308,21 +305,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="iterator">To be added.</param>
-        <param name="size">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">Type of elements</param>
-        <param name="c">The collection</param>
+        <param name="iterator">The iterator for the source</param>
+        <param name="size">The number of elements in the source, to be reported as
+                   initial <c>estimateSize</c></param>
         <param name="characteristics">Characteristics of this spliterator's source or
                    elements.  The characteristics <c>SIZED</c> and <c>SUBSIZED</c>
                    are additionally reported unless <c>CONCURRENT</c> is supplied.</param>
-        <summary>Creates a <c>Spliterator</c> using the given collection's
-            <c>java.util.Collection#iterator()</c> as the source of elements, and
-            reporting its <c>java.util.Collection#size()</c> as its initial size.</summary>
+        <summary>Creates a <c>Spliterator</c> using a given <c>Iterator</c>
+            as the source of elements, and with a given initially reported size.</summary>
         <returns>A spliterator from an iterator</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Spliterators#spliterator(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.spliterator(java.util.Collection, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Spliterators#spliterator(java.util.Iterator,%20long,%20int)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.spliterator(java.util.Iterator, long, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -370,23 +366,20 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="array">To be added.</param>
-        <param name="fromIndex">To be added.</param>
-        <param name="toIndex">To be added.</param>
-        <param name="additionalCharacteristics">To be added.</param>
         <param name="&lt;T&gt;&lt;T&gt;">Type of elements</param>
-        <param name="c">The collection</param>
-        <param name="characteristics">Characteristics of this spliterator's source or
-                   elements.  The characteristics <c>SIZED</c> and <c>SUBSIZED</c>
-                   are additionally reported unless <c>CONCURRENT</c> is supplied.</param>
-        <summary>Creates a <c>Spliterator</c> using the given collection's
-            <c>java.util.Collection#iterator()</c> as the source of elements, and
-            reporting its <c>java.util.Collection#size()</c> as its initial size.</summary>
-        <returns>A spliterator from an iterator</returns>
+        <param name="array">The array, assumed to be unmodified during use</param>
+        <param name="fromIndex">The least index (inclusive) to cover</param>
+        <param name="toIndex">One past the greatest index to cover</param>
+        <param name="additionalCharacteristics">Additional spliterator characteristics
+                   of this spliterator's source or elements beyond <c>SIZED</c> and
+                   <c>SUBSIZED</c> which are are always reported</param>
+        <summary>Creates a <c>Spliterator</c> covering a range of elements of a given
+            array, using a customized set of spliterator characteristics.</summary>
+        <returns>A spliterator for an array</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Spliterators#spliterator(java.util.Collection,%20int)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.spliterator(java.util.Collection, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Spliterators#spliterator(java.lang.Object[],%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Spliterators.spliterator(java.lang.Object[], int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/SplittableRandom.xml b/docs/Mono.Android/en/Java.Util/SplittableRandom.xml
index 33e84a1376..aef1301469 100644
--- a/docs/Mono.Android/en/Java.Util/SplittableRandom.xml
+++ b/docs/Mono.Android/en/Java.Util/SplittableRandom.xml
@@ -90,15 +90,13 @@
         <Parameter Name="seed" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="seed">To be added.</param>
-        <summary>Creates a new SplittableRandom instance that is likely to
-            generate sequences of values that are statistically independent
-            of those of any other instances in the current program; and
-            may, and typically does, vary across program invocations.</summary>
+        <param name="seed">the initial seed</param>
+        <summary>Creates a new SplittableRandom instance using the specified
+            initial seed.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SplittableRandom#SplittableRandom()" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.SplittableRandom()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SplittableRandom#SplittableRandom(long)" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.SplittableRandom(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -239,15 +237,14 @@
         <Parameter Name="bound" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>double</c> value between zero
-            (inclusive) and one (exclusive).</summary>
+        <param name="bound">the upper bound (exclusive).  Must be positive.</param>
+        <summary>Returns a pseudorandom <c>double</c> value between 0.</summary>
         <returns>a pseudorandom <c>double</c> value between zero
-                    (inclusive) and one (exclusive)</returns>
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextDouble()" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextDouble()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextDouble(double)" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextDouble(double)</code>.</a>
             </format>
           </para>
           <para>
@@ -282,16 +279,16 @@
         <Parameter Name="bound" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="origin">To be added.</param>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>double</c> value between zero
-            (inclusive) and one (exclusive).</summary>
-        <returns>a pseudorandom <c>double</c> value between zero
-                    (inclusive) and one (exclusive)</returns>
+        <param name="origin">the least value returned</param>
+        <param name="bound">the upper bound (exclusive)</param>
+        <summary>Returns a pseudorandom <c>double</c> value between the specified
+            origin (inclusive) and bound (exclusive).</summary>
+        <returns>a pseudorandom <c>double</c> value between the origin
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextDouble()" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextDouble()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextDouble(double,%20double)" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextDouble(double, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -362,13 +359,15 @@
         <Parameter Name="bound" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>int</c> value.</summary>
-        <returns>a pseudorandom <c>int</c> value</returns>
+        <param name="bound">the upper bound (exclusive).  Must be positive.</param>
+        <summary>Returns a pseudorandom <c>int</c> value between zero (inclusive)
+            and the specified bound (exclusive).</summary>
+        <returns>a pseudorandom <c>int</c> value between zero
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextInt()" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextInt()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextInt(int)" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextInt(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -403,14 +402,16 @@
         <Parameter Name="bound" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="origin">To be added.</param>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>int</c> value.</summary>
-        <returns>a pseudorandom <c>int</c> value</returns>
+        <param name="origin">the least value returned</param>
+        <param name="bound">the upper bound (exclusive)</param>
+        <summary>Returns a pseudorandom <c>int</c> value between the specified
+            origin (inclusive) and the specified bound (exclusive).</summary>
+        <returns>a pseudorandom <c>int</c> value between the origin
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextInt()" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextInt()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextInt(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextInt(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -481,13 +482,15 @@
         <Parameter Name="bound" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>long</c> value.</summary>
-        <returns>a pseudorandom <c>long</c> value</returns>
+        <param name="bound">the upper bound (exclusive).  Must be positive.</param>
+        <summary>Returns a pseudorandom <c>long</c> value between zero (inclusive)
+            and the specified bound (exclusive).</summary>
+        <returns>a pseudorandom <c>long</c> value between zero
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextLong()" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextLong(long)" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextLong(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -522,14 +525,16 @@
         <Parameter Name="bound" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="origin">To be added.</param>
-        <param name="bound">To be added.</param>
-        <summary>Returns a pseudorandom <c>long</c> value.</summary>
-        <returns>a pseudorandom <c>long</c> value</returns>
+        <param name="origin">the least value returned</param>
+        <param name="bound">the upper bound (exclusive)</param>
+        <summary>Returns a pseudorandom <c>long</c> value between the specified
+            origin (inclusive) and the specified bound (exclusive).</summary>
+        <returns>a pseudorandom <c>long</c> value between the origin
+                    (inclusive) and the bound (exclusive)</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextLong()" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextLong()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/SplittableRandom#nextLong(long,%20long)" title="Reference documentation">Java documentation for <code>java.util.SplittableRandom.nextLong(long, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/StringJoiner.xml b/docs/Mono.Android/en/Java.Util/StringJoiner.xml
index e867382127..fee7bcabc6 100644
--- a/docs/Mono.Android/en/Java.Util/StringJoiner.xml
+++ b/docs/Mono.Android/en/Java.Util/StringJoiner.xml
@@ -117,17 +117,16 @@
         <Parameter Name="suffix" Type="Java.Lang.ICharSequence" />
       </Parameters>
       <Docs>
-        <param name="prefix">To be added.</param>
-        <param name="suffix">To be added.</param>
         <param name="delimiter">the sequence of characters to be used between each
-                    element added to the <c>StringJoiner</c> value</param>
-        <summary>Constructs a <c>StringJoiner</c> with no characters in it, with no
-            <c>prefix</c> or <c>suffix</c>, and a copy of the supplied
-            <c>delimiter</c>.</summary>
+                    element added to the <c>StringJoiner</c></param>
+        <param name="prefix">the sequence of characters to be used at the beginning</param>
+        <param name="suffix">the sequence of characters to be used at the end</param>
+        <summary>Constructs a <c>StringJoiner</c> with no characters in it using copies
+            of the supplied <c>prefix</c>, <c>delimiter</c> and <c>suffix</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/StringJoiner#StringJoiner(java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.StringJoiner.StringJoiner(java.lang.CharSequence)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/StringJoiner#StringJoiner(java.lang.CharSequence,%20java.lang.CharSequence,%20java.lang.CharSequence)" title="Reference documentation">Java documentation for <code>java.util.StringJoiner.StringJoiner(java.lang.CharSequence, java.lang.CharSequence, java.lang.CharSequence)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/StringTokenizer.xml b/docs/Mono.Android/en/Java.Util/StringTokenizer.xml
index 309fc51b1e..ab00f80cfe 100644
--- a/docs/Mono.Android/en/Java.Util/StringTokenizer.xml
+++ b/docs/Mono.Android/en/Java.Util/StringTokenizer.xml
@@ -129,13 +129,13 @@
         <Parameter Name="delim" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="delim">To be added.</param>
         <param name="str">a string to be parsed.</param>
+        <param name="delim">the delimiters.</param>
         <summary>Constructs a string tokenizer for the specified string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/StringTokenizer#StringTokenizer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.StringTokenizer.StringTokenizer(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/StringTokenizer#StringTokenizer(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.StringTokenizer.StringTokenizer(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -169,14 +169,15 @@
         <Parameter Name="returnDelims" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="delim">To be added.</param>
-        <param name="returnDelims">To be added.</param>
         <param name="str">a string to be parsed.</param>
+        <param name="delim">the delimiters.</param>
+        <param name="returnDelims">flag indicating whether to return the delimiters
+                                    as tokens.</param>
         <summary>Constructs a string tokenizer for the specified string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/StringTokenizer#StringTokenizer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.StringTokenizer.StringTokenizer(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/StringTokenizer#StringTokenizer(java.lang.String,%20java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.StringTokenizer.StringTokenizer(java.lang.String, java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -474,13 +475,13 @@
         <Parameter Name="delim" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="delim">To be added.</param>
-        <summary>Returns the next token from this string tokenizer.</summary>
-        <returns>the next token from this string tokenizer.</returns>
+        <param name="delim">the new delimiters.</param>
+        <summary>Returns the next token in this string tokenizer's string.</summary>
+        <returns>the next token, after switching to the new delimiter set.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/StringTokenizer#nextToken()" title="Reference documentation">Java documentation for <code>java.util.StringTokenizer.nextToken()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/StringTokenizer#nextToken(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.StringTokenizer.nextToken(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/TimeZone.xml b/docs/Mono.Android/en/Java.Util/TimeZone.xml
index bb8c06443b..0bd17caaa2 100644
--- a/docs/Mono.Android/en/Java.Util/TimeZone.xml
+++ b/docs/Mono.Android/en/Java.Util/TimeZone.xml
@@ -332,13 +332,15 @@
         <Parameter Name="rawOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="rawOffset">To be added.</param>
-        <summary>Gets all the available IDs supported.</summary>
-        <returns>an array of IDs.</returns>
+        <param name="rawOffset">the given time zone GMT offset in milliseconds.</param>
+        <summary>Gets the available IDs according to the given time zone offset in milliseconds.</summary>
+        <returns>an array of IDs, where the time zone for that ID has
+            the specified GMT offset. For example, "America/Phoenix" and "America/Denver"
+            both have GMT-07:00, but differ in daylight saving behavior.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TimeZone#getAvailableIDs()" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getAvailableIDs()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TimeZone#getAvailableIDs(int)" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getAvailableIDs(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -373,14 +375,14 @@
         <Parameter Name="locale" Type="Java.Util.Locale" />
       </Parameters>
       <Docs>
-        <param name="locale">To be added.</param>
+        <param name="locale">the locale in which to supply the display name.</param>
         <summary>Returns a long standard time name of this <c>TimeZone</c> suitable for
-            presentation to the user in the default locale.</summary>
-        <returns>the human-readable name of this time zone in the default locale.</returns>
+            presentation to the user in the specified <c>locale</c>.</summary>
+        <returns>the human-readable name of this time zone in the given locale.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TimeZone#getDisplayName()" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getDisplayName()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TimeZone#getDisplayName(java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getDisplayName(java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -423,15 +425,17 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="daylight">To be added.</param>
-        <param name="style">To be added.</param>
-        <summary>Returns a long standard time name of this <c>TimeZone</c> suitable for
-            presentation to the user in the default locale.</summary>
+        <param name="daylight">
+          <c>true</c> specifying a Daylight Saving Time name, or
+                            <c>false</c> specifying a Standard Time name</param>
+        <param name="style">either <c>#LONG</c> or <c>#SHORT</c></param>
+        <summary>Returns a name in the specified <c>style</c> of this <c>TimeZone</c>
+            suitable for presentation to the user in the default locale.</summary>
         <returns>the human-readable name of this time zone in the default locale.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TimeZone#getDisplayName()" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getDisplayName()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TimeZone#getDisplayName(boolean,%20int)" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getDisplayName(boolean, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -476,16 +480,15 @@
       </Parameters>
       <Docs>
         <param name="daylightTime">true for daylight time, false for standard time.</param>
-        <param name="style">either <see cref="F:Java.Util.TimeZone.Long" /> or <see cref="F:Java.Util.TimeZone.Short" />.</param>
-        <param name="locale">the display locale.
-</param>
-        <summary>Returns a long standard time name of this <c>TimeZone</c> suitable for
-            presentation to the user in the default locale.</summary>
+        <param name="style">either <c>TimeZone#LONG</c> or <c>TimeZone#SHORT</c>.</param>
+        <param name="locale">the display locale.</param>
+        <summary>Returns the <c>#SHORT short</c> or <c>#LONG long</c> name of this time
+            zone with either standard or daylight time, as written in <c>locale</c>.</summary>
         <returns>the human-readable name of this time zone in the default locale.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TimeZone#getDisplayName()" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getDisplayName()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TimeZone#getDisplayName(boolean,%20int,%20java.util.Locale)" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getDisplayName(boolean, int, java.util.Locale)</code>.</a>
             </format>
           </para>
           <para>
@@ -520,22 +523,14 @@
         <Parameter Name="date" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="date">To be added.</param>
-        <param name="era">the era of the given date.</param>
-        <param name="year">the year in the given date.</param>
-        <param name="month">the month in the given date.
-            Month is 0-based. e.g., 0 for January.</param>
-        <param name="day">the day-in-month of the given date.</param>
-        <param name="dayOfWeek">the day-of-week of the given date.</param>
-        <param name="milliseconds">the milliseconds in day in &lt;em&gt;standard&lt;/em&gt;
-            local time.</param>
-        <summary>Gets the time zone offset, for current date, modified in case of
-            daylight savings.</summary>
-        <returns>the offset in milliseconds to add to GMT to get local time.</returns>
+        <param name="date">the date represented in milliseconds since January 1, 1970 00:00:00 GMT</param>
+        <summary>Returns the offset of this time zone from UTC at the specified
+            date.</summary>
+        <returns>the amount of time in milliseconds to add to UTC to get local time.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TimeZone#getOffset(int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getOffset(int, int, int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TimeZone#getOffset(long)" title="Reference documentation">Java documentation for <code>java.util.TimeZone.getOffset(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Timer.xml b/docs/Mono.Android/en/Java.Util/Timer.xml
index 1171ed9b75..f6d5eb8d3e 100644
--- a/docs/Mono.Android/en/Java.Util/Timer.xml
+++ b/docs/Mono.Android/en/Java.Util/Timer.xml
@@ -88,12 +88,13 @@
         <Parameter Name="isDaemon" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="isDaemon">To be added.</param>
-        <summary>Creates a new timer.</summary>
+        <param name="isDaemon">true if the associated thread should run as a daemon.</param>
+        <summary>Creates a new timer whose associated thread may be specified to
+            Thread#setDaemon run as a daemon.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Timer#Timer()" title="Reference documentation">Java documentation for <code>java.util.Timer.Timer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Timer#Timer(boolean)" title="Reference documentation">Java documentation for <code>java.util.Timer.Timer(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -125,12 +126,12 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Creates a new timer.</summary>
+        <param name="name">the name of the associated thread</param>
+        <summary>Creates a new timer whose associated thread has the specified name.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Timer#Timer()" title="Reference documentation">Java documentation for <code>java.util.Timer.Timer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Timer#Timer(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.Timer.Timer(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,13 +188,15 @@
         <Parameter Name="isDaemon" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="isDaemon">To be added.</param>
-        <summary>Creates a new timer.</summary>
+        <param name="name">the name of the associated thread</param>
+        <param name="isDaemon">true if the associated thread should run as a daemon</param>
+        <summary>Creates a new timer whose associated thread has the specified name,
+            and may be specified to
+            Thread#setDaemon run as a daemon.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Timer#Timer()" title="Reference documentation">Java documentation for <code>java.util.Timer.Timer()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Timer#Timer(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.Timer.Timer(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -336,14 +339,13 @@
         <Parameter Name="time" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="time">To be added.</param>
         <param name="task">task to be scheduled.</param>
-        <param name="delay">delay in milliseconds before task is to be executed.</param>
-        <summary>Schedules the specified task for execution after the specified delay.</summary>
+        <param name="time">time at which task is to be executed.</param>
+        <summary>Schedules the specified task for execution at the specified time.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Timer#schedule(java.util.TimerTask,%20long)" title="Reference documentation">Java documentation for <code>java.util.Timer.schedule(java.util.TimerTask, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Timer#schedule(java.util.TimerTask,%20java.util.Date)" title="Reference documentation">Java documentation for <code>java.util.Timer.schedule(java.util.TimerTask, java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -430,15 +432,15 @@
         <Parameter Name="period" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="firstTime">To be added.</param>
-        <param name="period">amount of time in milliseconds between subsequent executions.</param>
         <param name="task">task to be scheduled.</param>
-        <param name="delay">delay in milliseconds before task is to be executed.</param>
-        <summary>Schedules the specified task for execution after the specified delay.</summary>
+        <param name="firstTime">First time at which task is to be executed.</param>
+        <param name="period">time in milliseconds between successive task executions.</param>
+        <summary>Schedules the specified task for repeated <i>fixed-delay execution</i>,
+            beginning at the specified time.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Timer#schedule(java.util.TimerTask,%20long)" title="Reference documentation">Java documentation for <code>java.util.Timer.schedule(java.util.TimerTask, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Timer#schedule(java.util.TimerTask,%20java.util.Date,%20long)" title="Reference documentation">Java documentation for <code>java.util.Timer.schedule(java.util.TimerTask, java.util.Date, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -479,14 +481,15 @@
         <Parameter Name="period" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="period">amount of time in milliseconds between subsequent executions.</param>
         <param name="task">task to be scheduled.</param>
         <param name="delay">delay in milliseconds before task is to be executed.</param>
-        <summary>Schedules the specified task for execution after the specified delay.</summary>
+        <param name="period">time in milliseconds between successive task executions.</param>
+        <summary>Schedules the specified task for repeated <i>fixed-delay execution</i>,
+            beginning after the specified delay.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Timer#schedule(java.util.TimerTask,%20long)" title="Reference documentation">Java documentation for <code>java.util.Timer.schedule(java.util.TimerTask, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Timer#schedule(java.util.TimerTask,%20long,%20long)" title="Reference documentation">Java documentation for <code>java.util.Timer.schedule(java.util.TimerTask, long, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -527,16 +530,15 @@
         <Parameter Name="period" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="firstTime">To be added.</param>
         <param name="task">task to be scheduled.</param>
-        <param name="delay">delay in milliseconds before task is to be executed.</param>
+        <param name="firstTime">First time at which task is to be executed.</param>
         <param name="period">time in milliseconds between successive task executions.</param>
         <summary>Schedules the specified task for repeated <i>fixed-rate execution</i>,
-            beginning after the specified delay.</summary>
+            beginning at the specified time.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Timer#scheduleAtFixedRate(java.util.TimerTask,%20long,%20long)" title="Reference documentation">Java documentation for <code>java.util.Timer.scheduleAtFixedRate(java.util.TimerTask, long, long)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Timer#scheduleAtFixedRate(java.util.TimerTask,%20java.util.Date,%20long)" title="Reference documentation">Java documentation for <code>java.util.Timer.scheduleAtFixedRate(java.util.TimerTask, java.util.Date, long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml b/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml
index b320bb33f2..b18df721f3 100644
--- a/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml
+++ b/docs/Mono.Android/en/Java.Util/TooManyListenersException.xml
@@ -89,12 +89,12 @@
         <Parameter Name="s" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a TooManyListenersException with no detail message.</summary>
+        <param name="s">the detail message</param>
+        <summary>Constructs a TooManyListenersException with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TooManyListenersException#TooManyListenersException()" title="Reference documentation">Java documentation for <code>java.util.TooManyListenersException.TooManyListenersException()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TooManyListenersException#TooManyListenersException(java.lang.String)" title="Reference documentation">Java documentation for <code>java.util.TooManyListenersException.TooManyListenersException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/TreeMap.xml b/docs/Mono.Android/en/Java.Util/TreeMap.xml
index 8eb4554f56..97d2cb40a2 100644
--- a/docs/Mono.Android/en/Java.Util/TreeMap.xml
+++ b/docs/Mono.Android/en/Java.Util/TreeMap.xml
@@ -119,13 +119,15 @@
         <Parameter Name="comparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="comparator">To be added.</param>
-        <summary>Constructs a new, empty tree map, using the natural ordering of its
-            keys.</summary>
+        <param name="comparator">the comparator that will be used to order this map.
+                   If <c>null</c>, the Comparable natural
+                   ordering of the keys will be used.</param>
+        <summary>Constructs a new, empty tree map, ordered according to the given
+            comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeMap#TreeMap()" title="Reference documentation">Java documentation for <code>java.util.TreeMap.TreeMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeMap#TreeMap(java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.TreeMap(java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -156,13 +158,13 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <summary>Constructs a new, empty tree map, using the natural ordering of its
-            keys.</summary>
+        <param name="m">the map whose mappings are to be placed in this map</param>
+        <summary>Constructs a new tree map containing the same mappings as the given
+            map, ordered according to the &lt;em&gt;natural ordering&lt;/em&gt; of its keys.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeMap#TreeMap()" title="Reference documentation">Java documentation for <code>java.util.TreeMap.TreeMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeMap#TreeMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.TreeMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -755,7 +757,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeMap#headMap(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.headMap(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeMap#headMap(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.headMap(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1370,7 +1372,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeMap#subMap(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.subMap(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeMap#subMap(java.lang.Object,%20boolean,%20java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.subMap(java.lang.Object, boolean, java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1458,7 +1460,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeMap#tailMap(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.tailMap(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeMap#tailMap(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.TreeMap.tailMap(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/TreeSet.xml b/docs/Mono.Android/en/Java.Util/TreeSet.xml
index 4c55f3c764..8b99f97521 100644
--- a/docs/Mono.Android/en/Java.Util/TreeSet.xml
+++ b/docs/Mono.Android/en/Java.Util/TreeSet.xml
@@ -124,13 +124,15 @@
         <Parameter Name="comparator" Type="Java.Util.IComparator" />
       </Parameters>
       <Docs>
-        <param name="comparator">To be added.</param>
-        <summary>Constructs a new, empty tree set, sorted according to the
-            natural ordering of its elements.</summary>
+        <param name="comparator">the comparator that will be used to order this set.
+                   If <c>null</c>, the Comparable natural
+                   ordering of the elements will be used.</param>
+        <summary>Constructs a new, empty tree set, sorted according to the specified
+            comparator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeSet#TreeSet()" title="Reference documentation">Java documentation for <code>java.util.TreeSet.TreeSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeSet#TreeSet(java.util.Comparator)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.TreeSet(java.util.Comparator)</code>.</a>
             </format>
           </para>
           <para>
@@ -161,13 +163,13 @@
         <Parameter Name="s" Type="Java.Util.ISortedSet" />
       </Parameters>
       <Docs>
-        <param name="s">To be added.</param>
-        <summary>Constructs a new, empty tree set, sorted according to the
-            natural ordering of its elements.</summary>
+        <param name="s">sorted set whose elements will comprise the new set</param>
+        <summary>Constructs a new tree set containing the same elements and
+            using the same ordering as the specified sorted set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeSet#TreeSet()" title="Reference documentation">Java documentation for <code>java.util.TreeSet.TreeSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeSet#TreeSet(java.util.SortedSet)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.TreeSet(java.util.SortedSet)</code>.</a>
             </format>
           </para>
           <para>
@@ -198,13 +200,14 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs a new, empty tree set, sorted according to the
-            natural ordering of its elements.</summary>
+        <param name="c">collection whose elements will comprise the new set</param>
+        <summary>Constructs a new tree set containing the elements in the specified
+            collection, sorted according to the <i>natural ordering</i> of its
+            elements.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeSet#TreeSet()" title="Reference documentation">Java documentation for <code>java.util.TreeSet.TreeSet()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeSet#TreeSet(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.TreeSet(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -599,7 +602,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeSet#headSet(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.headSet(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeSet#headSet(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.headSet(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1065,7 +1068,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeSet#subSet(java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.subSet(java.lang.Object, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeSet#subSet(java.lang.Object,%20boolean,%20java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.subSet(java.lang.Object, boolean, java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1153,7 +1156,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/TreeSet#tailSet(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.tailSet(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/TreeSet#tailSet(java.lang.Object,%20boolean)" title="Reference documentation">Java documentation for <code>java.util.TreeSet.tailSet(java.lang.Object, boolean)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/Vector.xml b/docs/Mono.Android/en/Java.Util/Vector.xml
index b8a15dee3c..17d571ce0c 100644
--- a/docs/Mono.Android/en/Java.Util/Vector.xml
+++ b/docs/Mono.Android/en/Java.Util/Vector.xml
@@ -122,14 +122,15 @@
         <Parameter Name="c" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Constructs an empty vector so that its internal data array
-            has size <c>10</c> and its standard capacity increment is
-            zero.</summary>
+        <param name="c">the collection whose elements are to be placed into this
+                  vector</param>
+        <summary>Constructs a vector containing the elements of the specified
+            collection, in the order they are returned by the collection's
+            iterator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Vector#Vector()" title="Reference documentation">Java documentation for <code>java.util.Vector.Vector()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Vector#Vector(java.util.Collection)" title="Reference documentation">Java documentation for <code>java.util.Vector.Vector(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -160,14 +161,13 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Constructs an empty vector so that its internal data array
-            has size <c>10</c> and its standard capacity increment is
-            zero.</summary>
+        <param name="initialCapacity">the initial capacity of the vector</param>
+        <summary>Constructs an empty vector with the specified initial capacity and
+            with its capacity increment equal to zero.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Vector#Vector()" title="Reference documentation">Java documentation for <code>java.util.Vector.Vector()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Vector#Vector(int)" title="Reference documentation">Java documentation for <code>java.util.Vector.Vector(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -202,15 +202,15 @@
         <Parameter Name="capacityIncrement" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="capacityIncrement">To be added.</param>
-        <summary>Constructs an empty vector so that its internal data array
-            has size <c>10</c> and its standard capacity increment is
-            zero.</summary>
+        <param name="initialCapacity">the initial capacity of the vector</param>
+        <param name="capacityIncrement">the amount by which the capacity is
+                                         increased when the vector overflows</param>
+        <summary>Constructs an empty vector with the specified initial capacity and
+            capacity increment.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Vector#Vector()" title="Reference documentation">Java documentation for <code>java.util.Vector.Vector()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Vector#Vector(int,%20int)" title="Reference documentation">Java documentation for <code>java.util.Vector.Vector(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -767,16 +767,18 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
         <param name="o">element to search for</param>
-        <summary>Returns the index of the first occurrence of the specified element
-            in this vector, or -1 if this vector does not contain the element.</summary>
-        <returns>the index of the first occurrence of the specified element in
-                    this vector, or -1 if this vector does not contain the element</returns>
+        <param name="index">index to start searching from</param>
+        <summary>Returns the index of the first occurrence of the specified element in
+            this vector, searching forwards from <c>index</c>, or returns -1 if
+            the element is not found.</summary>
+        <returns>the index of the first occurrence of the element in
+                    this vector at position <c>index</c> or later in the vector;
+                    <c>-1</c> if the element is not found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Vector#indexOf(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Vector.indexOf(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Vector#indexOf(java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.util.Vector.indexOf(java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -933,16 +935,18 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
         <param name="o">element to search for</param>
-        <summary>Returns the index of the last occurrence of the specified element
-            in this vector, or -1 if this vector does not contain the element.</summary>
-        <returns>the index of the last occurrence of the specified element in
-                    this vector, or -1 if this vector does not contain the element</returns>
+        <param name="index">index to start searching backwards from</param>
+        <summary>Returns the index of the last occurrence of the specified element in
+            this vector, searching backwards from <c>index</c>, or returns -1 if
+            the element is not found.</summary>
+        <returns>the index of the last occurrence of the element at position
+                    less than or equal to <c>index</c> in this vector;
+                    -1 if the element is not found.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/Vector#lastIndexOf(java.lang.Object)" title="Reference documentation">Java documentation for <code>java.util.Vector.lastIndexOf(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/Vector#lastIndexOf(java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>java.util.Vector.lastIndexOf(java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Java.Util/WeakHashMap.xml b/docs/Mono.Android/en/Java.Util/WeakHashMap.xml
index 43ce2b754d..ea90a712c5 100644
--- a/docs/Mono.Android/en/Java.Util/WeakHashMap.xml
+++ b/docs/Mono.Android/en/Java.Util/WeakHashMap.xml
@@ -108,13 +108,13 @@
         <Parameter Name="m" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="m">To be added.</param>
-        <summary>Constructs a new, empty <c>WeakHashMap</c> with the default initial
-            capacity (16) and load factor (0.</summary>
+        <param name="m">the map whose mappings are to be placed in this map</param>
+        <summary>Constructs a new <c>WeakHashMap</c> with the same mappings as the
+            specified map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/WeakHashMap#WeakHashMap()" title="Reference documentation">Java documentation for <code>java.util.WeakHashMap.WeakHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/WeakHashMap#WeakHashMap(java.util.Map)" title="Reference documentation">Java documentation for <code>java.util.WeakHashMap.WeakHashMap(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -145,13 +145,13 @@
         <Parameter Name="initialCapacity" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <summary>Constructs a new, empty <c>WeakHashMap</c> with the default initial
-            capacity (16) and load factor (0.</summary>
+        <param name="initialCapacity">The initial capacity of the <c>WeakHashMap</c></param>
+        <summary>Constructs a new, empty <c>WeakHashMap</c> with the given initial
+            capacity and the default load factor (0.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/WeakHashMap#WeakHashMap()" title="Reference documentation">Java documentation for <code>java.util.WeakHashMap.WeakHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/WeakHashMap#WeakHashMap(int)" title="Reference documentation">Java documentation for <code>java.util.WeakHashMap.WeakHashMap(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -186,14 +186,14 @@
         <Parameter Name="loadFactor" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="initialCapacity">To be added.</param>
-        <param name="loadFactor">To be added.</param>
-        <summary>Constructs a new, empty <c>WeakHashMap</c> with the default initial
-            capacity (16) and load factor (0.</summary>
+        <param name="initialCapacity">The initial capacity of the <c>WeakHashMap</c></param>
+        <param name="loadFactor">The load factor of the <c>WeakHashMap</c></param>
+        <summary>Constructs a new, empty <c>WeakHashMap</c> with the given initial
+            capacity and the given load factor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/java/util/WeakHashMap#WeakHashMap()" title="Reference documentation">Java documentation for <code>java.util.WeakHashMap.WeakHashMap()</code>.</a>
+              <a href="https://developer.android.com/reference/java/util/WeakHashMap#WeakHashMap(int,%20float)" title="Reference documentation">Java documentation for <code>java.util.WeakHashMap.WeakHashMap(int, float)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml
index 92856b550a..8f026c58a1 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DESKeySpec.xml
@@ -109,15 +109,18 @@
         <Parameter Name="offset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
         <param name="key">the buffer with the DES key material. The first 8 bytes
-            of the buffer are copied to protect against subsequent modification.</param>
+            of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive are copied
+            to protect against subsequent modification.</param>
+        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt;, where the DES key
+            material starts.</param>
         <summary>Creates a DESKeySpec object using the first 8 bytes in
-            &lt;code&gt;key&lt;/code&gt; as the key material for the DES key.</summary>
+            &lt;code&gt;key&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive,
+            as the key material for the DES key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec#DESKeySpec(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.DESKeySpec.DESKeySpec(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec#DESKeySpec(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.DESKeySpec.DESKeySpec(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml
index e0ab7fd9ac..9cc38e8598 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DESedeKeySpec.xml
@@ -111,16 +111,18 @@
         <Parameter Name="offset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
         <param name="key">the buffer with the DES-EDE key material. The first
-            24 bytes of the buffer are copied to protect against subsequent
-            modification.</param>
+            24 bytes of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive
+            are copied to protect against subsequent modification.</param>
+        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt;, where the DES-EDE key
+            material starts.</param>
         <summary>Creates a DESedeKeySpec object using the first 24 bytes in
-            &lt;code&gt;key&lt;/code&gt; as the key material for the DES-EDE key.</summary>
+            &lt;code&gt;key&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive,
+            as the key material for the DES-EDE key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec#DESedeKeySpec(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.DESedeKeySpec.DESedeKeySpec(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec#DESedeKeySpec(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.DESedeKeySpec.DESedeKeySpec(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml
index 8e68b5dc7a..e485d274e3 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/DHParameterSpec.xml
@@ -134,15 +134,17 @@
         <Parameter Name="l" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="l">To be added.</param>
         <param name="p">the prime modulus</param>
         <param name="g">the base generator</param>
+        <param name="l">the size in bits of the random exponent (private value)</param>
         <summary>Constructs a parameter set for Diffie-Hellman, using a prime modulus
-            &lt;code&gt;p&lt;/code&gt; and a base generator &lt;code&gt;g&lt;/code&gt;.</summary>
+            &lt;code&gt;p&lt;/code&gt;, a base generator &lt;code&gt;g&lt;/code&gt;,
+            and the size in bits, &lt;code&gt;l&lt;/code&gt;, of the random exponent
+            (private value).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec#DHParameterSpec(java.math.BigInteger,%20java.math.BigInteger)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.DHParameterSpec.DHParameterSpec(java.math.BigInteger, java.math.BigInteger)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec#DHParameterSpec(java.math.BigInteger,%20java.math.BigInteger,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.DHParameterSpec.DHParameterSpec(java.math.BigInteger, java.math.BigInteger, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/GCMParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/GCMParameterSpec.xml
index f5b29ff401..e12a1793de 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/GCMParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/GCMParameterSpec.xml
@@ -133,17 +133,18 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="tLen">the authentication tag length (in bits)</param>
-        <param name="src">the IV source buffer.  The contents of the buffer are
-            copied to protect against subsequent modification.</param>
-        <summary>Constructs a GCMParameterSpec using the specified authentication
-            tag bit-length and IV buffer.</summary>
+        <param name="src">the IV source buffer.  The contents of the
+            buffer are copied to protect against subsequent modification.</param>
+        <param name="offset">the offset in <c>src</c> where the IV starts</param>
+        <param name="len">the number of IV bytes</param>
+        <summary>Constructs a GCMParameterSpec object using the specified
+            authentication tag bit-length and a subset of the specified
+            buffer as the IV.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/GCMParameterSpec#GCMParameterSpec(int,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.GCMParameterSpec.GCMParameterSpec(int, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/GCMParameterSpec#GCMParameterSpec(int,%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.GCMParameterSpec.GCMParameterSpec(int, byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml
index 2e1a2d2c72..40793813d7 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/IvParameterSpec.xml
@@ -133,16 +133,19 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="len">To be added.</param>
-        <param name="iv">the buffer with the IV. The contents of the
-            buffer are copied to protect against subsequent modification.</param>
-        <summary>Creates an IvParameterSpec object using the bytes in &lt;code&gt;iv&lt;/code&gt;
-            as the IV.</summary>
+        <param name="iv">the buffer with the IV. The first &lt;code&gt;len&lt;/code&gt;
+            bytes of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive
+            are copied to protect against subsequent modification.</param>
+        <param name="offset">the offset in &lt;code&gt;iv&lt;/code&gt; where the IV
+            starts.</param>
+        <param name="len">the number of IV bytes.</param>
+        <summary>Creates an IvParameterSpec object using the first &lt;code&gt;len&lt;/code&gt;
+            bytes in &lt;code&gt;iv&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt;
+            inclusive, as the IV.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/IvParameterSpec#IvParameterSpec(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.IvParameterSpec.IvParameterSpec(byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/IvParameterSpec#IvParameterSpec(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.IvParameterSpec.IvParameterSpec(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml
index a36e5450a5..f615503c9b 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/OAEPParameterSpec.xml
@@ -95,16 +95,22 @@
         <Parameter Name="pSrc" Type="Javax.Crypto.Spec.PSource" />
       </Parameters>
       <Docs>
-        <param name="mdName">To be added.</param>
-        <param name="mgfName">To be added.</param>
-        <param name="mgfSpec">To be added.</param>
-        <param name="pSrc">To be added.</param>
+        <param name="mdName">the algorithm name for the message digest.</param>
+        <param name="mgfName">the algorithm name for the mask generation
+            function.</param>
+        <param name="mgfSpec">the parameters for the mask generation function.
+            If null is specified, null will be returned by getMGFParameters().</param>
+        <param name="pSrc">the source of the encoding input P.</param>
         <summary>Constructs a parameter set for OAEP padding as defined in
-            the PKCS #1 standard using the default values.</summary>
+            the PKCS #1 standard using the specified message digest
+            algorithm &lt;code&gt;mdName&lt;/code&gt;, mask generation function
+            algorithm &lt;code&gt;mgfName&lt;/code&gt;, parameters for the mask
+            generation function &lt;code&gt;mgfSpec&lt;/code&gt;, and source of
+            the encoding input P &lt;code&gt;pSrc&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec#OAEPParameterSpec()" title="Reference documentation">Java documentation for <code>javax.crypto.spec.OAEPParameterSpec.OAEPParameterSpec()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec#OAEPParameterSpec(java.lang.String,%20java.lang.String,%20java.security.spec.AlgorithmParameterSpec,%20javax.crypto.spec.PSource)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.OAEPParameterSpec.OAEPParameterSpec(java.lang.String, java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.spec.PSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/PBEKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/PBEKeySpec.xml
index 14a93be05c..888906f0c5 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/PBEKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/PBEKeySpec.xml
@@ -130,14 +130,15 @@
         <Parameter Name="iterationCount" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="salt">To be added.</param>
-        <param name="iterationCount">To be added.</param>
         <param name="password">the password.</param>
-        <summary>Constructor that takes a password.</summary>
+        <param name="salt">the salt.</param>
+        <param name="iterationCount">the iteration count.</param>
+        <summary>Constructor that takes a password, salt, iteration count for
+            generating PBEKey of fixed-key-size PBE ciphers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec#PBEKeySpec(char[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.PBEKeySpec.PBEKeySpec(char[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec#PBEKeySpec(char[],%20byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.PBEKeySpec.PBEKeySpec(char[], byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -175,15 +176,17 @@
         <Parameter Name="keyLength" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="salt">To be added.</param>
-        <param name="iterationCount">To be added.</param>
-        <param name="keyLength">To be added.</param>
         <param name="password">the password.</param>
-        <summary>Constructor that takes a password.</summary>
+        <param name="salt">the salt.</param>
+        <param name="iterationCount">the iteration count.</param>
+        <param name="keyLength">the to-be-derived key length.</param>
+        <summary>Constructor that takes a password, salt, iteration count, and
+            to-be-derived key length for generating PBEKey of variable-key-size
+            PBE ciphers.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec#PBEKeySpec(char[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.PBEKeySpec.PBEKeySpec(char[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec#PBEKeySpec(char[],%20byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.PBEKeySpec.PBEKeySpec(char[], byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml
index 3df49b931c..cd6a387077 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/PBEParameterSpec.xml
@@ -137,16 +137,17 @@
         <Parameter Name="paramSpec" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="paramSpec">To be added.</param>
         <param name="salt">the salt. The contents of &lt;code&gt;salt&lt;/code&gt; are copied
             to protect against subsequent modification.</param>
         <param name="iterationCount">the iteration count.</param>
+        <param name="paramSpec">the cipher algorithm parameter specification, which
+            may be null.</param>
         <summary>Constructs a parameter set for password-based encryption as defined in
             the PKCS #5 standard.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec#PBEParameterSpec(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.PBEParameterSpec.PBEParameterSpec(byte[], int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec#PBEParameterSpec(byte[],%20int,%20java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.PBEParameterSpec.PBEParameterSpec(byte[], int, java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml
index d829a2b8c4..82b26265cb 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/RC2ParameterSpec.xml
@@ -107,14 +107,15 @@
         <Parameter Name="iv" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="iv">To be added.</param>
         <param name="effectiveKeyBits">the effective key size in bits.</param>
+        <param name="iv">the buffer with the 8-byte IV. The first 8 bytes of
+            the buffer are copied to protect against subsequent modification.</param>
         <summary>Constructs a parameter set for RC2 from the given effective key size
-            (in bits).</summary>
+            (in bits) and an 8-byte IV.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec#RC2ParameterSpec(int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC2ParameterSpec.RC2ParameterSpec(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec#RC2ParameterSpec(int,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC2ParameterSpec.RC2ParameterSpec(int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -173,15 +174,18 @@
         <Parameter Name="offset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="iv">To be added.</param>
-        <param name="offset">To be added.</param>
         <param name="effectiveKeyBits">the effective key size in bits.</param>
+        <param name="iv">the buffer with the IV. The first 8 bytes
+            of the buffer beginning at &lt;code&gt;offset&lt;/code&gt; inclusive
+            are copied to protect against subsequent modification.</param>
+        <param name="offset">the offset in &lt;code&gt;iv&lt;/code&gt; where the 8-byte IV
+            starts.</param>
         <summary>Constructs a parameter set for RC2 from the given effective key size
-            (in bits).</summary>
+            (in bits) and IV.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec#RC2ParameterSpec(int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC2ParameterSpec.RC2ParameterSpec(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec#RC2ParameterSpec(int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC2ParameterSpec.RC2ParameterSpec(int, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml
index eac1f9092b..d925f42ad0 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/RC5ParameterSpec.xml
@@ -136,16 +136,18 @@
         <Parameter Name="iv" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="iv">To be added.</param>
         <param name="version">the version.</param>
         <param name="rounds">the number of rounds.</param>
         <param name="wordSize">the word size in bits.</param>
+        <param name="iv">the buffer with the IV. The first &lt;code&gt;2*(wordSize/8)
+            &lt;/code&gt; bytes of the buffer are copied to protect against subsequent
+            modification.</param>
         <summary>Constructs a parameter set for RC5 from the given version, number of
-            rounds and word size (in bits).</summary>
+            rounds, word size (in bits), and IV.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec#RC5ParameterSpec(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC5ParameterSpec.RC5ParameterSpec(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec#RC5ParameterSpec(int,%20int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC5ParameterSpec.RC5ParameterSpec(int, int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -184,17 +186,19 @@
         <Parameter Name="offset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="iv">To be added.</param>
-        <param name="offset">To be added.</param>
         <param name="version">the version.</param>
         <param name="rounds">the number of rounds.</param>
         <param name="wordSize">the word size in bits.</param>
+        <param name="iv">the buffer with the IV. The first &lt;code&gt;2*(wordSize/8)
+            &lt;/code&gt; bytes of the buffer beginning at &lt;code&gt;offset&lt;/code&gt;
+            inclusive are copied to protect against subsequent modification.</param>
+        <param name="offset">the offset in &lt;code&gt;iv&lt;/code&gt; where the IV starts.</param>
         <summary>Constructs a parameter set for RC5 from the given version, number of
-            rounds and word size (in bits).</summary>
+            rounds, word size (in bits), and IV.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec#RC5ParameterSpec(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC5ParameterSpec.RC5ParameterSpec(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec#RC5ParameterSpec(int,%20int,%20int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.RC5ParameterSpec.RC5ParameterSpec(int, int, int, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml b/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml
index b06606e57f..e20368a3db 100644
--- a/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml
+++ b/docs/Mono.Android/en/Javax.Crypto.Spec/SecretKeySpec.xml
@@ -77,26 +77,19 @@
         <Parameter Name="algorithm" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="key">the key material of the secret key. The first
-            &lt;code&gt;len&lt;/code&gt; bytes of the array beginning at
-            &lt;code&gt;offset&lt;/code&gt; inclusive are copied to protect
-            against subsequent modification.</param>
-        <param name="offset">the offset in &lt;code&gt;key&lt;/code&gt; where the key material
-            starts.</param>
-        <param name="len">the length of the key material.</param>
+        <param name="key">the key material of the secret key. The contents of
+            the array are copied to protect against subsequent modification.</param>
         <param name="algorithm">the name of the secret-key algorithm to be associated
             with the given key material.
             See Appendix A in the &lt;a href=
               "https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA"&gt;
             Java Cryptography Architecture Reference Guide&lt;/a&gt;
             for information about standard algorithm names.</param>
-        <summary>Constructs a secret key from the given byte array, using the first
-            &lt;code&gt;len&lt;/code&gt; bytes of &lt;code&gt;key&lt;/code&gt;, starting at
-            &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
+        <summary>Constructs a secret key from the given byte array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec#SecretKeySpec(byte[],%20int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.SecretKeySpec.SecretKeySpec(byte[], int, int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec#SecretKeySpec(byte[],%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.spec.SecretKeySpec.SecretKeySpec(byte[], java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/AEADBadTagException.xml b/docs/Mono.Android/en/Javax.Crypto/AEADBadTagException.xml
index 246e9a0fdd..6cb34bc374 100644
--- a/docs/Mono.Android/en/Javax.Crypto/AEADBadTagException.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/AEADBadTagException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a AEADBadTagException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a AEADBadTagException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/AEADBadTagException#AEADBadTagException()" title="Reference documentation">Java documentation for <code>javax.crypto.AEADBadTagException.AEADBadTagException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/AEADBadTagException#AEADBadTagException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.AEADBadTagException.AEADBadTagException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/BadPaddingException.xml b/docs/Mono.Android/en/Javax.Crypto/BadPaddingException.xml
index 1c51d895ca..202ec8cbed 100644
--- a/docs/Mono.Android/en/Javax.Crypto/BadPaddingException.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/BadPaddingException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a BadPaddingException with no detail
-            message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a BadPaddingException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/BadPaddingException#BadPaddingException()" title="Reference documentation">Java documentation for <code>javax.crypto.BadPaddingException.BadPaddingException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/BadPaddingException#BadPaddingException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.BadPaddingException.BadPaddingException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/Cipher.xml b/docs/Mono.Android/en/Javax.Crypto/Cipher.xml
index a67980cfc0..3bdd8ba79e 100644
--- a/docs/Mono.Android/en/Javax.Crypto/Cipher.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/Cipher.xml
@@ -285,14 +285,14 @@
         <Parameter Name="input" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="input">the input buffer.</param>
-        <summary>Finishes a multiple-part encryption or decryption operation, depending
-            on how this cipher was initialized.</summary>
+        <param name="input">the input buffer</param>
+        <summary>Encrypts or decrypts data in a single-part operation, or finishes a
+            multiple-part operation.</summary>
         <returns>the new buffer with the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -334,15 +334,15 @@
         <Parameter Name="output" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="input">the input buffer.</param>
-        <param name="output">the output buffer.</param>
-        <summary>Finishes a multiple-part encryption or decryption operation, depending
-            on how this cipher was initialized.</summary>
-        <returns>the new buffer with the result</returns>
+        <param name="input">the input ByteBuffer</param>
+        <param name="output">the output ByteBuffer</param>
+        <summary>Encrypts or decrypts data in a single-part operation, or finishes a
+            multiple-part operation.</summary>
+        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -387,15 +387,16 @@
         <Parameter Name="outputOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="output">the output buffer.</param>
-        <param name="outputOffset">the offset in the output buffer.</param>
+        <param name="output">the buffer for the result</param>
+        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+            is stored</param>
         <summary>Finishes a multiple-part encryption or decryption operation, depending
             on how this cipher was initialized.</summary>
-        <returns>the new buffer with the result</returns>
+        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -439,16 +440,17 @@
         <Parameter Name="inputLen" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="input">the input buffer.</param>
-        <param name="inputOffset">the offset in the input buffer.</param>
-        <param name="inputLen">the length of the input</param>
-        <summary>Finishes a multiple-part encryption or decryption operation, depending
-            on how this cipher was initialized.</summary>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
+        <summary>Encrypts or decrypts data in a single-part operation, or finishes a
+            multiple-part operation.</summary>
         <returns>the new buffer with the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -494,17 +496,18 @@
         <Parameter Name="output" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="input">the input buffer.</param>
-        <param name="inputOffset">the offset in the input buffer.</param>
-        <param name="inputLen">the length of the input.</param>
-        <param name="output">the output buffer for the transformed bytes.</param>
-        <summary>Finishes a multiple-part encryption or decryption operation, depending
-            on how this cipher was initialized.</summary>
-        <returns>the new buffer with the result</returns>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
+        <param name="output">the buffer for the result</param>
+        <summary>Encrypts or decrypts data in a single-part operation, or finishes a
+            multiple-part operation.</summary>
+        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal(byte[],%20int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal(byte[], int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -552,18 +555,20 @@
         <Parameter Name="outputOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="input">the input buffer.</param>
-        <param name="inputOffset">the offset in the input buffer.</param>
-        <param name="inputLen">the length of the input.</param>
-        <param name="output">the output buffer for the transformed bytes.</param>
-        <param name="outputOffset">the offset in the output buffer.</param>
-        <summary>Finishes a multiple-part encryption or decryption operation, depending
-            on how this cipher was initialized.</summary>
-        <returns>the new buffer with the result</returns>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
+        <param name="output">the buffer for the result</param>
+        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+            is stored</param>
+        <summary>Encrypts or decrypts data in a single-part operation, or finishes a
+            multiple-part operation.</summary>
+        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#doFinal(byte[],%20int,%20int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.doFinal(byte[], int, int, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -740,20 +745,20 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider to ask for the transformation.</param>
-        <param name="transformation">the name of the transformation, e.g.,
-            <i>DES/CBC/PKCS5Padding</i>.
+        <param name="transformation">the name of the transformation,
+            e.g., <i>DES/CBC/PKCS5Padding</i>.
             See the Cipher section in the &lt;a href=
               "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Cipher"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard transformation names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a &lt;code&gt;Cipher&lt;/code&gt; object that implements the specified
             transformation.</summary>
         <returns>a cipher that implements the requested transformation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -796,20 +801,20 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider to ask for the transformation.</param>
-        <param name="transformation">the name of the transformation, e.g.,
-            <i>DES/CBC/PKCS5Padding</i>.
+        <param name="transformation">the name of the transformation,
+            e.g., <i>DES/CBC/PKCS5Padding</i>.
             See the Cipher section in the &lt;a href=
               "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Cipher"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard transformation names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;Cipher&lt;/code&gt; object that implements the specified
             transformation.</summary>
         <returns>a cipher that implements the requested transformation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1811,16 +1816,17 @@
         <Parameter Name="input" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the new buffer with the result, or null if the underlying
+            cipher is a block cipher and the input data is too short to result in a
+            new block.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1912,18 +1918,20 @@
         <Parameter Name="inputLen" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="inputOffset">the offset in the input to start.</param>
-        <param name="inputLen">the length of the input to transform.</param>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the new buffer with the result, or null if the underlying
+            cipher is a block cipher and the input data is too short to result in a
+            new block.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1967,10 +1975,11 @@
         <Parameter Name="output" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="inputOffset">the offset in the input to start.</param>
-        <param name="inputLen">the length of the input to transform.</param>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
+        <param name="output">the buffer for the result</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
@@ -1978,7 +1987,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(byte[],%20int,%20int,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(byte[], int, int, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2024,11 +2033,13 @@
         <Parameter Name="outputOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="inputOffset">the offset in the input to start.</param>
-        <param name="inputLen">the length of the input to transform.</param>
-        <param name="outputOffset">the offset in the output buffer.</param>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
+        <param name="output">the buffer for the result</param>
+        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+            is stored</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
@@ -2036,7 +2047,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#update(byte[],%20int,%20int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.update(byte[], int, int, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2122,13 +2133,13 @@
         <Parameter Name="src" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="src">the buffer containing the AAD</param>
+        <param name="src">the buffer containing the Additional Authentication Data</param>
         <summary>Continues a multi-part update of the Additional Authentication
             Data (AAD).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#updateAAD(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.updateAAD(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#updateAAD(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.updateAAD(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -2168,15 +2179,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="src">the buffer containing the AAD</param>
+        <param name="offset">the offset in <c>src</c> where the AAD input starts</param>
+        <param name="len">the number of AAD bytes</param>
         <summary>Continues a multi-part update of the Additional Authentication
-            Data (AAD).</summary>
+            Data (AAD), using a subset of the provided buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Cipher#updateAAD(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.updateAAD(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Cipher#updateAAD(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Cipher.updateAAD(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/CipherInputStream.xml b/docs/Mono.Android/en/Javax.Crypto/CipherInputStream.xml
index 35d1a56198..7a0dcca209 100644
--- a/docs/Mono.Android/en/Javax.Crypto/CipherInputStream.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/CipherInputStream.xml
@@ -119,14 +119,14 @@
         <Parameter Name="c" Type="Javax.Crypto.Cipher" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
         <param name="is">the to-be-processed input stream</param>
-        <summary>Constructs a CipherInputStream from an InputStream without
-            specifying a Cipher.</summary>
+        <param name="c">an initialized Cipher object</param>
+        <summary>Constructs a CipherInputStream from an InputStream and a
+            Cipher.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherInputStream#CipherInputStream(java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherInputStream.CipherInputStream(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherInputStream#CipherInputStream(java.io.InputStream,%20javax.crypto.Cipher)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherInputStream.CipherInputStream(java.io.InputStream, javax.crypto.Cipher)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/CipherOutputStream.xml b/docs/Mono.Android/en/Javax.Crypto/CipherOutputStream.xml
index 32507f44ec..10d9e75581 100644
--- a/docs/Mono.Android/en/Javax.Crypto/CipherOutputStream.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/CipherOutputStream.xml
@@ -118,14 +118,14 @@
         <Parameter Name="c" Type="Javax.Crypto.Cipher" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
         <param name="os">the OutputStream object</param>
-        <summary>Constructs a CipherOutputStream from an OutputStream without
-            specifying a Cipher.</summary>
+        <param name="c">an initialized Cipher object</param>
+        <summary>Constructs a CipherOutputStream from an OutputStream and a
+            Cipher.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherOutputStream#CipherOutputStream(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherOutputStream.CipherOutputStream(java.io.OutputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherOutputStream#CipherOutputStream(java.io.OutputStream,%20javax.crypto.Cipher)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherOutputStream.CipherOutputStream(java.io.OutputStream, javax.crypto.Cipher)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml b/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml
index c903be6e5d..31925b9fea 100644
--- a/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/CipherSpi.xml
@@ -160,17 +160,17 @@
         <Parameter Name="inputLen" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="inputOffset">the offset in the input buffer.</param>
-        <param name="inputLen">the length of the input.</param>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
         <summary>Encrypts or decrypts data in a single-part operation,
             or finishes a multiple-part operation.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the new buffer with the result</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineDoFinal(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineDoFinal(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineDoFinal(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineDoFinal(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -213,18 +213,20 @@
         <Parameter Name="outputOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="inputOffset">the offset in the input buffer.</param>
-        <param name="inputLen">the length of the input.</param>
-        <param name="outputOffset">the offset in the output buffer.</param>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
+        <param name="output">the buffer for the result</param>
+        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+            is stored</param>
         <summary>Encrypts or decrypts data in a single-part operation,
             or finishes a multiple-part operation.</summary>
         <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineDoFinal(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineDoFinal(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineDoFinal(byte[],%20int,%20int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineDoFinal(byte[], int, int, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -477,14 +479,13 @@
             &lt;code&gt;ENCRYPT_MODE&lt;/code&gt;, &lt;code&gt;DECRYPT_MODE&lt;/code&gt;,
             &lt;code&gt;WRAP_MODE&lt;/code&gt; or &lt;code&gt;UNWRAP_MODE&lt;/code&gt;)</param>
         <param name="key">the encryption key</param>
-        <param name="params">the algorithm parameters</param>
         <param name="random">the source of randomness</param>
-        <summary>Initializes this cipher with a key, a set of
-            algorithm parameters, and a source of randomness.</summary>
+        <summary>Initializes this cipher with a key and a source
+            of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineInit(int,%20java.security.Key,%20java.security.AlgorithmParameters,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineInit(int,%20java.security.Key,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineInit(int, java.security.Key, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -592,7 +593,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineInit(int,%20java.security.Key,%20java.security.AlgorithmParameters,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineInit(int,%20java.security.Key,%20java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -820,18 +821,20 @@
         <Parameter Name="inputLen" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="inputOffset">the offset in the input to start.</param>
-        <param name="inputLen">the length of the input to transform.</param>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
-        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
+        <returns>the new buffer with the result, or null if the underlying
+            cipher is a block cipher and the input data is too short to result in a
+            new block.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineUpdate(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineUpdate(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineUpdate(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -874,11 +877,13 @@
         <Parameter Name="outputOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="inputOffset">the offset in the input to start.</param>
-        <param name="inputLen">the length of the input to transform.</param>
-        <param name="outputOffset">the offset in the output buffer.</param>
-        <param name="input">the input ByteBuffer</param>
-        <param name="output">the output ByteByffer</param>
+        <param name="input">the input buffer</param>
+        <param name="inputOffset">the offset in &lt;code&gt;input&lt;/code&gt; where the input
+            starts</param>
+        <param name="inputLen">the input length</param>
+        <param name="output">the buffer for the result</param>
+        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+            is stored</param>
         <summary>Continues a multiple-part encryption or decryption operation
             (depending on how this cipher was initialized), processing another data
             part.</summary>
@@ -886,7 +891,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineUpdate(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineUpdate(byte[],%20int,%20int,%20byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineUpdate(byte[], int, int, byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -965,15 +970,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">To be added.</param>
-        <param name="len">To be added.</param>
         <param name="src">the buffer containing the AAD</param>
+        <param name="offset">the offset in <c>src</c> where the AAD input starts</param>
+        <param name="len">the number of AAD bytes</param>
         <summary>Continues a multi-part update of the Additional Authentication
-            Data (AAD).</summary>
+            Data (AAD), using a subset of the provided buffer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineUpdateAAD(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineUpdateAAD(java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/CipherSpi#engineUpdateAAD(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.CipherSpi.engineUpdateAAD(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml b/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml
index c6a073b87b..3ced0b18df 100644
--- a/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/EncryptedPrivateKeyInfo.xml
@@ -55,21 +55,13 @@
         <Parameter Name="encoded" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="encoded">To be added.</param>
-        <param name="algName">encryption algorithm name. See Appendix A in the
-            &lt;a href=
-              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA"&gt;
-            Java Cryptography Architecture Reference Guide&lt;/a&gt;
-            for information about standard Cipher algorithm names.</param>
-        <param name="encryptedData">encrypted data. The contents of
-            &lt;code&gt;encrypedData&lt;/code&gt; are copied to protect against subsequent
-            modification when constructing this object.</param>
-        <summary>Constructs an &lt;code&gt;EncryptedPrivateKeyInfo&lt;/code&gt; from the
-            encryption algorithm name and the encrypted data.</summary>
+        <param name="encoded">the ASN.1 encoding of this object. The contents of
+            the array are copied to protect against subsequent modification.</param>
+        <summary>Constructs (i.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#EncryptedPrivateKeyInfo(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.EncryptedPrivateKeyInfo(java.lang.String, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#EncryptedPrivateKeyInfo(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.EncryptedPrivateKeyInfo(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -105,21 +97,20 @@
         <Parameter Name="encryptedData" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="algParams">To be added.</param>
-        <param name="algName">encryption algorithm name. See Appendix A in the
-            &lt;a href=
-              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA"&gt;
-            Java Cryptography Architecture Reference Guide&lt;/a&gt;
-            for information about standard Cipher algorithm names.</param>
+        <param name="algParams">the algorithm parameters for the encryption
+            algorithm. &lt;code&gt;algParams.getEncoded()&lt;/code&gt; should return
+            the ASN.1 encoded bytes of the &lt;code&gt;parameters&lt;/code&gt; field
+            of the &lt;code&gt;AlgorithmIdentifer&lt;/code&gt; component of the
+            &lt;code&gt;EncryptedPrivateKeyInfo&lt;/code&gt; type.</param>
         <param name="encryptedData">encrypted data. The contents of
-            &lt;code&gt;encrypedData&lt;/code&gt; are copied to protect against subsequent
-            modification when constructing this object.</param>
+            &lt;code&gt;encrypedData&lt;/code&gt; are copied to protect against
+            subsequent modification when constructing this object.</param>
         <summary>Constructs an &lt;code&gt;EncryptedPrivateKeyInfo&lt;/code&gt; from the
-            encryption algorithm name and the encrypted data.</summary>
+            encryption algorithm parameters and the encrypted data.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#EncryptedPrivateKeyInfo(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.EncryptedPrivateKeyInfo(java.lang.String, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#EncryptedPrivateKeyInfo(java.security.AlgorithmParameters,%20byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.EncryptedPrivateKeyInfo(java.security.AlgorithmParameters, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -434,15 +425,15 @@
         <Parameter Name="cipher" Type="Javax.Crypto.Cipher" />
       </Parameters>
       <Docs>
-        <param name="cipher">the cipher initialized for decrypting the encrypted data.</param>
-        <param name="decryptKey">key used for decrypting the encrypted data.</param>
+        <param name="cipher">the initialized cipher object which will be
+            used for decrypting the encrypted data.</param>
         <summary>Extract the enclosed PKCS8EncodedKeySpec object from the
             encrypted data and return it.</summary>
         <returns>the PKCS8EncodedKeySpec object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#getKeySpec(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.getKeySpec(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#getKeySpec(javax.crypto.Cipher)" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.getKeySpec(javax.crypto.Cipher)</code>.</a>
             </format>
           </para>
           <para>
@@ -482,15 +473,16 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider whose cipher implementation should be used.</param>
         <param name="decryptKey">key used for decrypting the encrypted data.</param>
+        <param name="provider">the name of provider whose Cipher implementation
+            will be used.</param>
         <summary>Extract the enclosed PKCS8EncodedKeySpec object from the
             encrypted data and return it.</summary>
         <returns>the PKCS8EncodedKeySpec object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#getKeySpec(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.getKeySpec(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#getKeySpec(java.security.Key,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.getKeySpec(java.security.Key, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -532,16 +524,16 @@
         <Parameter Name="providerName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="providerName">the name of a provider whose cipher implementation should be
-            used.</param>
         <param name="decryptKey">key used for decrypting the encrypted data.</param>
+        <param name="providerName">the name of provider whose Cipher
+            implementation will be used.</param>
         <summary>Extract the enclosed PKCS8EncodedKeySpec object from the
             encrypted data and return it.</summary>
         <returns>the PKCS8EncodedKeySpec object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#getKeySpec(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.getKeySpec(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo#getKeySpec(java.security.Key,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.EncryptedPrivateKeyInfo.getKeySpec(java.security.Key, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml
index bb9a3be0f8..fbc36cf571 100644
--- a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanism.xml
@@ -165,13 +165,14 @@
         <Parameter Name="output" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="output">the output buffer for the result key blob.</param>
-        <summary>Generates the exemption mechanism key blob.</summary>
-        <returns>the new buffer with the result key blob.</returns>
+        <param name="output">the buffer for the result</param>
+        <summary>Generates the exemption mechanism key blob, and stores the result in
+            the &lt;code&gt;output&lt;/code&gt; buffer.</summary>
+        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#genExemptionBlob()" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.genExemptionBlob()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#genExemptionBlob(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.genExemptionBlob(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -212,14 +213,17 @@
         <Parameter Name="outputOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="output">the output buffer for the result key blob.</param>
-        <param name="outputOffset">the offset in the output buffer to start.</param>
-        <summary>Generates the exemption mechanism key blob.</summary>
-        <returns>the new buffer with the result key blob.</returns>
+        <param name="output">the buffer for the result</param>
+        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+            is stored</param>
+        <summary>Generates the exemption mechanism key blob, and stores the result in
+            the &lt;code&gt;output&lt;/code&gt; buffer, starting at &lt;code&gt;outputOffset&lt;/code&gt;
+            inclusive.</summary>
+        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#genExemptionBlob()" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.genExemptionBlob()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#genExemptionBlob(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.genExemptionBlob(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -311,21 +315,20 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that is providing the algorithm.</param>
-        <param name="algorithm">the standard name of the requested exemption
-            mechanism.
+        <param name="algorithm">the standard name of the requested exemption mechanism.
             See the ExemptionMechanism section in the
             &lt;a href=
               "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Exemption"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard exemption mechanism names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns an &lt;code&gt;ExemptionMechanism&lt;/code&gt; object that implements the
             specified exemption mechanism algorithm.</summary>
         <returns>the new &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -366,21 +369,20 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that is providing the algorithm.</param>
-        <param name="algorithm">the standard name of the requested exemption
-            mechanism.
+        <param name="algorithm">the standard name of the requested exemption mechanism.
             See the ExemptionMechanism section in the
             &lt;a href=
               "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Exemption"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard exemption mechanism names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns an &lt;code&gt;ExemptionMechanism&lt;/code&gt; object that implements the
             specified exemption mechanism algorithm.</summary>
         <returns>the new &lt;code&gt;ExemptionMechanism&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -512,13 +514,14 @@
         <Parameter Name="params" Type="Java.Security.AlgorithmParameters" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="key">the key for this exemption mechanism</param>
-        <summary>Initializes this exemption mechanism with a key.</summary>
+        <param name="params">the algorithm parameters</param>
+        <summary>Initializes this exemption mechanism with a key and a set of algorithm
+            parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#init(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.init(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#init(java.security.Key,%20java.security.AlgorithmParameters)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.init(java.security.Key, java.security.AlgorithmParameters)</code>.</a>
             </format>
           </para>
           <para>
@@ -559,13 +562,14 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">To be added.</param>
         <param name="key">the key for this exemption mechanism</param>
-        <summary>Initializes this exemption mechanism with a key.</summary>
+        <param name="params">the algorithm parameters</param>
+        <summary>Initializes this exemption mechanism with a key and a set of algorithm
+            parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#init(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.init(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism#init(java.security.Key,%20java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanism.init(java.security.Key, java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismException.xml b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismException.xml
index faeea5edc7..3f076ad6f6 100644
--- a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismException.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a ExemptionMechanismException with no detailed message.</summary>
+        <param name="msg">the detailed message.</param>
+        <summary>Constructs a ExemptionMechanismException with the specified
+            detailed message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismException#ExemptionMechanismException()" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismException.ExemptionMechanismException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismException#ExemptionMechanismException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismException.ExemptionMechanismException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml
index 3f3837bcc3..f0c95e951e 100644
--- a/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/ExemptionMechanismSpi.xml
@@ -146,14 +146,17 @@
         <Parameter Name="outputOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="output">the output buffer for the result key blob.</param>
-        <param name="outputOffset">the offset in the output buffer to start.</param>
-        <summary>Generates the exemption mechanism key blob.</summary>
-        <returns>the new buffer with the result key blob.</returns>
+        <param name="output">the buffer for the result</param>
+        <param name="outputOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the result
+            is stored</param>
+        <summary>Generates the exemption mechanism key blob, and stores the result in
+            the &lt;code&gt;output&lt;/code&gt; buffer, starting at &lt;code&gt;outputOffset&lt;/code&gt;
+            inclusive.</summary>
+        <returns>the number of bytes stored in &lt;code&gt;output&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi#engineGenExemptionBlob()" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismSpi.engineGenExemptionBlob()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi#engineGenExemptionBlob(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismSpi.engineGenExemptionBlob(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -279,13 +282,14 @@
         <Parameter Name="params" Type="Java.Security.AlgorithmParameters" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for this exemption mechanism algorithm.</param>
         <param name="key">the key for this exemption mechanism</param>
-        <summary>Initializes this exemption mechanism with a key.</summary>
+        <param name="params">the algorithm parameters</param>
+        <summary>Initializes this exemption mechanism with a key and a set of algorithm
+            parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi#engineInit(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismSpi.engineInit(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi#engineInit(java.security.Key,%20java.security.AlgorithmParameters)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismSpi.engineInit(java.security.Key, java.security.AlgorithmParameters)</code>.</a>
             </format>
           </para>
           <para>
@@ -326,13 +330,14 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for this exemption mechanism algorithm.</param>
         <param name="key">the key for this exemption mechanism</param>
-        <summary>Initializes this exemption mechanism with a key.</summary>
+        <param name="params">the algorithm parameters</param>
+        <summary>Initializes this exemption mechanism with a key and a set of algorithm
+            parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi#engineInit(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismSpi.engineInit(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi#engineInit(java.security.Key,%20java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>javax.crypto.ExemptionMechanismSpi.engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/IllegalBlockSizeException.xml b/docs/Mono.Android/en/Javax.Crypto/IllegalBlockSizeException.xml
index 55c7a62ef2..7ffb44836b 100644
--- a/docs/Mono.Android/en/Javax.Crypto/IllegalBlockSizeException.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/IllegalBlockSizeException.xml
@@ -88,12 +88,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs an IllegalBlockSizeException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs an IllegalBlockSizeException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/IllegalBlockSizeException#IllegalBlockSizeException()" title="Reference documentation">Java documentation for <code>javax.crypto.IllegalBlockSizeException.IllegalBlockSizeException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/IllegalBlockSizeException#IllegalBlockSizeException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.IllegalBlockSizeException.IllegalBlockSizeException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml b/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml
index 2952a48b65..446b22c7c1 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyAgreement.xml
@@ -252,13 +252,14 @@
         <Parameter Name="algorithm" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="algorithm">the algorithm to for the <c>SecretKey</c></param>
-        <summary>Generates the shared secret and returns it in a new buffer.</summary>
-        <returns>the new buffer with the shared secret</returns>
+        <param name="algorithm">the requested secret-key algorithm</param>
+        <summary>Creates the shared secret and returns it as a &lt;code&gt;SecretKey&lt;/code&gt;
+            object of the specified algorithm.</summary>
+        <returns>the shared secret key</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#generateSecret()" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.generateSecret()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#generateSecret(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.generateSecret(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -300,14 +301,16 @@
         <Parameter Name="offset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sharedSecret">the buffer to store the shared secret.</param>
-        <param name="offset">the offset in the buffer.</param>
-        <summary>Generates the shared secret and returns it in a new buffer.</summary>
-        <returns>the new buffer with the shared secret</returns>
+        <param name="sharedSecret">the buffer for the shared secret</param>
+        <param name="offset">the offset in &lt;code&gt;sharedSecret&lt;/code&gt; where the
+            shared secret will be stored</param>
+        <summary>Generates the shared secret, and places it into the buffer
+            &lt;code&gt;sharedSecret&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
+        <returns>the number of bytes placed into &lt;code&gt;sharedSecret&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#generateSecret()" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.generateSecret()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#generateSecret(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.generateSecret(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -396,20 +399,20 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that provides the requested algorithm.</param>
         <param name="algorithm">the standard name of the requested key agreement
             algorithm.
             See the KeyAgreement section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyAgreement"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a &lt;code&gt;KeyAgreement&lt;/code&gt; object that implements the
             specified key agreement algorithm.</summary>
         <returns>the new &lt;code&gt;KeyAgreement&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -450,21 +453,20 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that provides the requested
-            algorithm.</param>
         <param name="algorithm">the standard name of the requested key agreement
             algorithm.
             See the KeyAgreement section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyAgreement"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;KeyAgreement&lt;/code&gt; object that implements the
             specified key agreement algorithm.</summary>
         <returns>the new &lt;code&gt;KeyAgreement&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -551,16 +553,16 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="random">the source for any randomness needed.</param>
         <param name="key">the party's private information. For example, in the case
             of the Diffie-Hellman key agreement, this would be the party's own
             Diffie-Hellman private key.</param>
-        <summary>Initializes this key agreement with the given key, which is required to
-            contain all the algorithm parameters required for this key agreement.</summary>
+        <param name="random">the source of randomness</param>
+        <summary>Initializes this key agreement with the given key and source of
+            randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#init(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.init(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#init(java.security.Key,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.init(java.security.Key, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -599,16 +601,16 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for this key agreement algorithm.</param>
         <param name="key">the party's private information. For example, in the case
             of the Diffie-Hellman key agreement, this would be the party's own
             Diffie-Hellman private key.</param>
-        <summary>Initializes this key agreement with the given key, which is required to
-            contain all the algorithm parameters required for this key agreement.</summary>
+        <param name="params">the key agreement parameters</param>
+        <summary>Initializes this key agreement with the given key and set of
+            algorithm parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#init(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.init(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#init(java.security.Key,%20java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.init(java.security.Key, java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
@@ -650,17 +652,17 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for this key agreement algorithm.</param>
-        <param name="random">the source for any randomness needed.</param>
         <param name="key">the party's private information. For example, in the case
             of the Diffie-Hellman key agreement, this would be the party's own
             Diffie-Hellman private key.</param>
-        <summary>Initializes this key agreement with the given key, which is required to
-            contain all the algorithm parameters required for this key agreement.</summary>
+        <param name="params">the key agreement parameters</param>
+        <param name="random">the source of randomness</param>
+        <summary>Initializes this key agreement with the given key, set of
+            algorithm parameters, and source of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#init(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.init(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreement#init(java.security.Key,%20java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreement.init(java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml b/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml
index a74d1465a0..68279b67d9 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyAgreementSpi.xml
@@ -198,13 +198,14 @@
         <Parameter Name="algorithm" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="algorithm">the algorithm to for the <c>SecretKey</c></param>
-        <summary>Generates the shared secret and returns it in a new buffer.</summary>
-        <returns>the new buffer with the shared secret</returns>
+        <param name="algorithm">the requested secret key algorithm</param>
+        <summary>Creates the shared secret and returns it as a secret key object
+            of the requested algorithm type.</summary>
+        <returns>the shared secret key</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreementSpi#engineGenerateSecret()" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreementSpi.engineGenerateSecret()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreementSpi#engineGenerateSecret(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreementSpi.engineGenerateSecret(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -246,14 +247,16 @@
         <Parameter Name="offset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="sharedSecret">the buffer to store the shared secret.</param>
-        <param name="offset">the offset in the buffer.</param>
-        <summary>Generates the shared secret and returns it in a new buffer.</summary>
-        <returns>the new buffer with the shared secret</returns>
+        <param name="sharedSecret">the buffer for the shared secret</param>
+        <param name="offset">the offset in &lt;code&gt;sharedSecret&lt;/code&gt; where the
+            shared secret will be stored</param>
+        <summary>Generates the shared secret, and places it into the buffer
+            &lt;code&gt;sharedSecret&lt;/code&gt;, beginning at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
+        <returns>the number of bytes placed into &lt;code&gt;sharedSecret&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreementSpi#engineGenerateSecret()" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreementSpi.engineGenerateSecret()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreementSpi#engineGenerateSecret(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreementSpi.engineGenerateSecret(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -341,17 +344,17 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for this key agreement algorithm.</param>
         <param name="key">the party's private information. For example, in the case
             of the Diffie-Hellman key agreement, this would be the party's own
             Diffie-Hellman private key.</param>
+        <param name="params">the key agreement parameters</param>
         <param name="random">the source of randomness</param>
-        <summary>Initializes this key agreement with the given key and source of
-            randomness.</summary>
+        <summary>Initializes this key agreement with the given key, set of
+            algorithm parameters, and source of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreementSpi#engineInit(java.security.Key,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreementSpi.engineInit(java.security.Key, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyAgreementSpi#engineInit(java.security.Key,%20java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyAgreementSpi.engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml b/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml
index f2d48bc766..46575c9b07 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyGenerator.xml
@@ -246,19 +246,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that is providing the algorithm</param>
         <param name="algorithm">the standard name of the requested key algorithm.
             See the KeyGenerator section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyGenerator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a &lt;code&gt;KeyGenerator&lt;/code&gt; object that generates secret keys
             for the specified algorithm.</summary>
         <returns>the new &lt;code&gt;KeyGenerator&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -299,19 +299,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that is providing the algorithm.</param>
         <param name="algorithm">the standard name of the requested key algorithm.
             See the KeyGenerator section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyGenerator"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;KeyGenerator&lt;/code&gt; object that generates secret keys
             for the specified algorithm.</summary>
         <returns>the new &lt;code&gt;KeyGenerator&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -352,15 +352,12 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="random">the randomness source for any random bytes.
-</param>
-        <param name="keysize">the keysize. This is an algorithm-specific metric,
-            specified in number of bits.</param>
-        <summary>Initializes this key generator for a certain keysize.</summary>
+        <param name="random">the source of randomness for this generator</param>
+        <summary>Initializes this key generator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(int)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -395,14 +392,12 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for the key generation algorithm.</param>
-        <param name="keysize">the keysize. This is an algorithm-specific metric,
-            specified in number of bits.</param>
-        <summary>Initializes this key generator for a certain keysize.</summary>
+        <param name="params">the key generation parameters</param>
+        <summary>Initializes this key generator with the specified parameter set.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(int)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
@@ -482,15 +477,14 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for the key generation algorithm.</param>
-        <param name="random">the randomness source for any random bytes.</param>
-        <param name="keysize">the keysize. This is an algorithm-specific metric,
-            specified in number of bits.</param>
-        <summary>Initializes this key generator for a certain keysize.</summary>
+        <param name="params">the key generation parameters</param>
+        <param name="random">the source of randomness for this key generator</param>
+        <summary>Initializes this key generator with the specified parameter
+            set and a user-provided source of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(int)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -529,15 +523,15 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="random">the randomness source for any random bytes.
-</param>
         <param name="keysize">the keysize. This is an algorithm-specific metric,
             specified in number of bits.</param>
-        <summary>Initializes this key generator for a certain keysize.</summary>
+        <param name="random">the source of randomness for this key generator</param>
+        <summary>Initializes this key generator for a certain keysize, using a
+            user-provided source of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(int)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGenerator#init(int,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGenerator.init(int, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml b/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml
index 7a191c9614..c14f2d0678 100644
--- a/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/KeyGeneratorSpi.xml
@@ -143,15 +143,12 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="keysize">the keysize. This is an algorithm-specific metric,
-            specified in number of bits.</param>
-        <param name="random">the source of randomness for this key generator</param>
-        <summary>Initializes this key generator for a certain keysize, using the given
-            source of randomness.</summary>
+        <param name="random">the source of randomness for this generator</param>
+        <summary>Initializes the key generator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGeneratorSpi#engineInit(int,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGeneratorSpi.engineInit(int, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGeneratorSpi#engineInit(java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGeneratorSpi.engineInit(java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,16 +184,14 @@
         <Parameter Name="random" Type="Java.Security.SecureRandom" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for the key generation algorithm.</param>
-        <param name="keysize">the keysize. This is an algorithm-specific metric,
-            specified in number of bits.</param>
+        <param name="params">the key generation parameters</param>
         <param name="random">the source of randomness for this key generator</param>
-        <summary>Initializes this key generator for a certain keysize, using the given
-            source of randomness.</summary>
+        <summary>Initializes the key generator with the specified parameter
+            set and a user-provided source of randomness.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/KeyGeneratorSpi#engineInit(int,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGeneratorSpi.engineInit(int, java.security.SecureRandom)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/KeyGeneratorSpi#engineInit(java.security.spec.AlgorithmParameterSpec,%20java.security.SecureRandom)" title="Reference documentation">Java documentation for <code>javax.crypto.KeyGeneratorSpi.engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/Mac.xml b/docs/Mono.Android/en/Javax.Crypto/Mac.xml
index 8b372a228d..d1f2580d7a 100644
--- a/docs/Mono.Android/en/Javax.Crypto/Mac.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/Mac.xml
@@ -252,13 +252,13 @@
         <Parameter Name="input" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="input">the final bytes.</param>
-        <summary>Finishes the MAC operation.</summary>
+        <param name="input">data in bytes</param>
+        <summary>Processes the given array of bytes and finishes the MAC operation.</summary>
         <returns>the MAC result.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#doFinal(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.doFinal(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -296,14 +296,15 @@
         <Parameter Name="outOffset" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="output">the output buffer</param>
-        <param name="outOffset">the offset in the output buffer</param>
+        <param name="output">the buffer where the MAC result is stored</param>
+        <param name="outOffset">the offset in &lt;code&gt;output&lt;/code&gt; where the MAC is
+            stored</param>
         <summary>Finishes the MAC operation.</summary>
         <returns>the MAC result.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#doFinal()" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.doFinal()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#doFinal(byte[],%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.doFinal(byte[], int)</code>.</a>
             </format>
           </para>
           <para>
@@ -394,19 +395,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that is providing the algorithm.</param>
         <param name="algorithm">the standard name of the requested MAC algorithm.
             See the Mac section in the &lt;a href=
               "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Mac"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a &lt;code&gt;Mac&lt;/code&gt; object that implements the
             specified MAC algorithm.</summary>
         <returns>the new &lt;code&gt;Mac&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -448,19 +449,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that is providing the algorithm.</param>
         <param name="algorithm">the standard name of the requested MAC algorithm.
             See the Mac section in the &lt;a href=
               "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Mac"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;Mac&lt;/code&gt; object that implements the
             specified MAC algorithm.</summary>
         <returns>the new &lt;code&gt;Mac&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -547,13 +548,14 @@
         <Parameter Name="params" Type="Java.Security.Spec.IAlgorithmParameterSpec" />
       </Parameters>
       <Docs>
-        <param name="params">the parameters for this algorithm.</param>
         <param name="key">the key.</param>
-        <summary>Initializes this &lt;code&gt;Mac&lt;/code&gt; object with the given key.</summary>
+        <param name="params">the algorithm parameters.</param>
+        <summary>Initializes this &lt;code&gt;Mac&lt;/code&gt; object with the given key and
+            algorithm parameters.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#init(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.init(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#init(java.security.Key,%20java.security.spec.AlgorithmParameterSpec)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.init(java.security.Key, java.security.spec.AlgorithmParameterSpec)</code>.</a>
             </format>
           </para>
           <para>
@@ -800,12 +802,12 @@
         <Parameter Name="input" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="input">the input byte to be processed.</param>
-        <summary>Processes the given byte.</summary>
+        <param name="input">the ByteBuffer</param>
+        <summary>Processes &lt;code&gt;input.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#update(byte)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#update(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.update(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -842,12 +844,12 @@
         <Parameter Name="input" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="input">the input byte to be processed.</param>
-        <summary>Processes the given byte.</summary>
+        <param name="input">the array of bytes to be processed.</param>
+        <summary>Processes the given array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#update(byte)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#update(byte[])" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.update(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -928,14 +930,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the offset in the buffer.</param>
-        <param name="len">the length of the data in the buffer.</param>
-        <param name="input">the input byte to be processed.</param>
-        <summary>Processes the given byte.</summary>
+        <param name="input">the input buffer.</param>
+        <param name="offset">the offset in &lt;code&gt;input&lt;/code&gt; where the input starts.</param>
+        <param name="len">the number of bytes to process.</param>
+        <summary>Processes the first &lt;code&gt;len&lt;/code&gt; bytes in &lt;code&gt;input&lt;/code&gt;,
+            starting at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/Mac#update(byte)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.update(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/Mac#update(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.Mac.update(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml b/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml
index 3008e2fb2b..2cf7e38416 100644
--- a/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/MacSpi.xml
@@ -308,12 +308,12 @@
         <Parameter Name="input" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="input">the input byte to be processed.</param>
-        <summary>Processes the given byte.</summary>
+        <param name="input">the ByteBuffer</param>
+        <summary>Processes &lt;code&gt;input.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/MacSpi#engineUpdate(byte)" title="Reference documentation">Java documentation for <code>javax.crypto.MacSpi.engineUpdate(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/MacSpi#engineUpdate(java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.crypto.MacSpi.engineUpdate(java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -390,15 +390,15 @@
         <Parameter Name="len" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="offset">the offset in the buffer.</param>
-        <param name="len">the length of the data in the buffer.
-</param>
-        <param name="input">the input byte to be processed.</param>
-        <summary>Processes the given byte.</summary>
+        <param name="input">the input buffer.</param>
+        <param name="offset">the offset in &lt;code&gt;input&lt;/code&gt; where the input starts.</param>
+        <param name="len">the number of bytes to process.</param>
+        <summary>Processes the first &lt;code&gt;len&lt;/code&gt; bytes in &lt;code&gt;input&lt;/code&gt;,
+            starting at &lt;code&gt;offset&lt;/code&gt; inclusive.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/MacSpi#engineUpdate(byte)" title="Reference documentation">Java documentation for <code>javax.crypto.MacSpi.engineUpdate(byte)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/MacSpi#engineUpdate(byte[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.crypto.MacSpi.engineUpdate(byte[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/NoSuchPaddingException.xml b/docs/Mono.Android/en/Javax.Crypto/NoSuchPaddingException.xml
index 3dc5858516..7b04f86b00 100644
--- a/docs/Mono.Android/en/Javax.Crypto/NoSuchPaddingException.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/NoSuchPaddingException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a NoSuchPaddingException with no detail
-            message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a NoSuchPaddingException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/NoSuchPaddingException#NoSuchPaddingException()" title="Reference documentation">Java documentation for <code>javax.crypto.NoSuchPaddingException.NoSuchPaddingException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/NoSuchPaddingException#NoSuchPaddingException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.NoSuchPaddingException.NoSuchPaddingException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/SealedObject.xml b/docs/Mono.Android/en/Javax.Crypto/SealedObject.xml
index 4acd464498..54476c0d2a 100644
--- a/docs/Mono.Android/en/Javax.Crypto/SealedObject.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/SealedObject.xml
@@ -68,14 +68,12 @@
         <Parameter Name="so" Type="Javax.Crypto.SealedObject" />
       </Parameters>
       <Docs>
-        <param name="so">To be added.</param>
-        <param name="object">the object to be sealed; can be null.</param>
-        <param name="c">the cipher used to seal the object.</param>
-        <summary>Constructs a SealedObject from any Serializable object.</summary>
+        <param name="so">a SealedObject object</param>
+        <summary>Constructs a SealedObject object from the passed-in SealedObject.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/SealedObject#SealedObject(java.io.Serializable,%20javax.crypto.Cipher)" title="Reference documentation">Java documentation for <code>javax.crypto.SealedObject.SealedObject(java.io.Serializable, javax.crypto.Cipher)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/SealedObject#SealedObject(javax.crypto.SealedObject)" title="Reference documentation">Java documentation for <code>javax.crypto.SealedObject.SealedObject(javax.crypto.SealedObject)</code>.</a>
             </format>
           </para>
           <para>
@@ -289,14 +287,13 @@
         <Parameter Name="c" Type="Javax.Crypto.Cipher" />
       </Parameters>
       <Docs>
-        <param name="c">the cipher to decrypt the data.</param>
-        <param name="key">the key used to unseal the object.</param>
+        <param name="c">the cipher used to unseal the object</param>
         <summary>Retrieves the original (encapsulated) object.</summary>
         <returns>the original object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/SealedObject#getObject(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.SealedObject.getObject(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/SealedObject#getObject(javax.crypto.Cipher)" title="Reference documentation">Java documentation for <code>javax.crypto.SealedObject.getObject(javax.crypto.Cipher)</code>.</a>
             </format>
           </para>
           <para>
@@ -339,14 +336,15 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that provides the cipher algorithm.</param>
         <param name="key">the key used to unseal the object.</param>
+        <param name="provider">the name of the provider of the algorithm to unseal
+            the object.</param>
         <summary>Retrieves the original (encapsulated) object.</summary>
         <returns>the original object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/SealedObject#getObject(java.security.Key)" title="Reference documentation">Java documentation for <code>javax.crypto.SealedObject.getObject(java.security.Key)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/SealedObject#getObject(java.security.Key,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.SealedObject.getObject(java.security.Key, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml b/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml
index 0663d57a5f..f69910cf51 100644
--- a/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/SecretKeyFactory.xml
@@ -255,20 +255,20 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that provides the requested algorithm.</param>
         <param name="algorithm">the standard name of the requested secret-key
             algorithm.
             See the SecretKeyFactory section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SecretKeyFactory"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the provider.</param>
         <summary>Returns a &lt;code&gt;SecretKeyFactory&lt;/code&gt; object that converts
             secret keys of the specified algorithm.</summary>
         <returns>the new &lt;code&gt;SecretKeyFactory&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.SecretKeyFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.crypto.SecretKeyFactory.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -309,21 +309,20 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that provides the requested
-            algorithm.</param>
         <param name="algorithm">the standard name of the requested secret-key
             algorithm.
             See the SecretKeyFactory section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SecretKeyFactory"&gt;
             Java Cryptography Architecture Standard Algorithm Name Documentation&lt;/a&gt;
             for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;SecretKeyFactory&lt;/code&gt; object that converts
             secret keys of the specified algorithm.</summary>
         <returns>the new &lt;code&gt;SecretKeyFactory&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.SecretKeyFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.SecretKeyFactory.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Crypto/ShortBufferException.xml b/docs/Mono.Android/en/Javax.Crypto/ShortBufferException.xml
index dcc6d83c8d..33c815c688 100644
--- a/docs/Mono.Android/en/Javax.Crypto/ShortBufferException.xml
+++ b/docs/Mono.Android/en/Javax.Crypto/ShortBufferException.xml
@@ -89,13 +89,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a ShortBufferException with no detail
-            message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a ShortBufferException with the specified
+            detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/crypto/ShortBufferException#ShortBufferException()" title="Reference documentation">Java documentation for <code>javax.crypto.ShortBufferException.ShortBufferException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/crypto/ShortBufferException#ShortBufferException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.crypto.ShortBufferException.ShortBufferException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml
index c7ef0489db..4e0b3fb0e2 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactory.xml
@@ -249,19 +249,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that provides the requested algorithm.</param>
         <param name="algorithm">the standard name of the requested algorithm.
                      See the &lt;a href=
              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html"&gt;
                      Java Secure Socket Extension Reference Guide &lt;/a&gt;
                      for information about standard algorithm names.</param>
+        <param name="provider">an instance of the provider.</param>
         <summary>Returns a &lt;code&gt;KeyManagerFactory&lt;/code&gt; object that acts as a
             factory for key managers.</summary>
         <returns>the new &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactory.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -302,20 +302,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that provides the requested
-            algorithm.</param>
         <param name="algorithm">the standard name of the requested algorithm.
                      See the &lt;a href=
              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html"&gt;
                      Java Secure Socket Extension Reference Guide &lt;/a&gt;
                      for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;KeyManagerFactory&lt;/code&gt; object that acts as a
             factory for key managers.</summary>
         <returns>the new &lt;code&gt;KeyManagerFactory&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactory.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -394,14 +393,14 @@
         <Parameter Name="spec" Type="Javax.Net.Ssl.IManagerFactoryParameters" />
       </Parameters>
       <Docs>
-        <param name="spec">the factory parameters.</param>
-        <param name="ks">the key store or null</param>
-        <param name="password">the password for recovering keys in the KeyStore</param>
-        <summary>Initializes this factory with a source of key material.</summary>
+        <param name="spec">an implementation of a provider-specific parameter
+                     specification</param>
+        <summary>Initializes this factory with a source of provider-specific
+            key material.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory#init(java.security.KeyStore,%20char[])" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactory.init(java.security.KeyStore, char[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory#init(javax.net.ssl.ManagerFactoryParameters)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactory.init(javax.net.ssl.ManagerFactoryParameters)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml
index 29234c3eb6..e7a0b33f6d 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/KeyManagerFactorySpi.xml
@@ -143,14 +143,13 @@
         <Parameter Name="spec" Type="Javax.Net.Ssl.IManagerFactoryParameters" />
       </Parameters>
       <Docs>
-        <param name="spec">the factory parameters.</param>
-        <param name="ks">the key store or null</param>
-        <param name="password">the password for recovering keys</param>
+        <param name="spec">an implementation of a provider-specific parameter
+                     specification</param>
         <summary>Initializes this factory with a source of key material.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactorySpi#engineInit(java.security.KeyStore,%20char[])" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactorySpi.engineInit(java.security.KeyStore, char[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactorySpi#engineInit(javax.net.ssl.ManagerFactoryParameters)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyManagerFactorySpi.engineInit(javax.net.ssl.ManagerFactoryParameters)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/KeyStoreBuilderParameters.xml b/docs/Mono.Android/en/Javax.Net.Ssl/KeyStoreBuilderParameters.xml
index c6166d3ea2..2a441436b8 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/KeyStoreBuilderParameters.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/KeyStoreBuilderParameters.xml
@@ -106,14 +106,13 @@
         <Parameter Name="parameters" Type="System.Collections.Generic.IList&lt;Java.Security.KeyStore+Builder&gt;" />
       </Parameters>
       <Docs>
-        <param name="parameters">To be added.</param>
-        <param name="builder">the Builder object</param>
-        <summary>Construct new KeyStoreBuilderParameters from the specified
-            java.</summary>
+        <param name="parameters">the List of Builder objects</param>
+        <summary>Construct new KeyStoreBuilderParameters from a List
+            of java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/KeyStoreBuilderParameters#KeyStoreBuilderParameters(java.security.Builder)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyStoreBuilderParameters.KeyStoreBuilderParameters(java.security.Builder)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/KeyStoreBuilderParameters#KeyStoreBuilderParameters(java.util.List)" title="Reference documentation">Java documentation for <code>javax.net.ssl.KeyStoreBuilderParameters.KeyStoreBuilderParameters(java.util.List)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SNIHostName.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SNIHostName.xml
index e512bf643d..ee019f80d8 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SNIHostName.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SNIHostName.xml
@@ -55,13 +55,12 @@
         <Parameter Name="encoded" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="encoded">To be added.</param>
-        <param name="hostname">the hostname of this server name</param>
-        <summary>Creates an <c>SNIHostName</c> using the specified hostname.</summary>
+        <param name="encoded">the encoded hostname of this server name</param>
+        <summary>Creates an <c>SNIHostName</c> using the specified encoded value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SNIHostName#SNIHostName(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SNIHostName.SNIHostName(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SNIHostName#SNIHostName(byte[])" title="Reference documentation">Java documentation for <code>javax.net.ssl.SNIHostName.SNIHostName(byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml
index df9892ccb7..5e35878320 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContext.xml
@@ -203,14 +203,15 @@
         <Parameter Name="peerPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="peerHost">the name of the host</param>
-        <param name="peerPort">the port</param>
-        <summary>Creates a new &lt;code&gt;SSLEngine&lt;/code&gt; using this context.</summary>
-        <returns>the &lt;code&gt;SSLEngine&lt;/code&gt; object</returns>
+        <param name="peerHost">the non-authoritative name of the host</param>
+        <param name="peerPort">the non-authoritative port</param>
+        <summary>Creates a new &lt;code&gt;SSLEngine&lt;/code&gt; using this context using
+            advisory peer information.</summary>
+        <returns>the new &lt;code&gt;SSLEngine&lt;/code&gt; object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContext#createSSLEngine()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContext.createSSLEngine()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContext#createSSLEngine(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContext.createSSLEngine(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -390,20 +391,20 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that provides the requested protocol.</param>
         <param name="protocol">the standard name of the requested protocol.
                      See the SSLContext section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SSLContext"&gt;
                      Java Cryptography Architecture Standard Algorithm Name
                      Documentation&lt;/a&gt;
                      for information about standard protocol names.</param>
+        <param name="provider">an instance of the provider.</param>
         <summary>Returns a &lt;code&gt;SSLContext&lt;/code&gt; object that implements the
             specified secure socket protocol.</summary>
         <returns>the new &lt;code&gt;SSLContext&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContext#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContext.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContext#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContext.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -444,20 +445,20 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that provides the requested protocol.</param>
         <param name="protocol">the standard name of the requested protocol.
                      See the SSLContext section in the &lt;a href=
             "https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SSLContext"&gt;
                      Java Cryptography Architecture Standard Algorithm Name
                      Documentation&lt;/a&gt;
                      for information about standard protocol names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;SSLContext&lt;/code&gt; object that implements the
             specified secure socket protocol.</summary>
         <returns>the new &lt;code&gt;SSLContext&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContext#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContext.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContext#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContext.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml
index c80b87dcc9..5d439f4cb6 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLContextSpi.xml
@@ -146,14 +146,14 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">the name of the host</param>
-        <param name="port">the port</param>
-        <summary>Creates a new &lt;code&gt;SSLEngine&lt;/code&gt; using this context.</summary>
+        <param name="host">the non-authoritative name of the host</param>
+        <param name="port">the non-authoritative port</param>
+        <summary>Creates a &lt;code&gt;SSLEngine&lt;/code&gt; using this context.</summary>
         <returns>the &lt;code&gt;SSLEngine&lt;/code&gt; Object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContextSpi#engineCreateSSLEngine()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContextSpi.engineCreateSSLEngine()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLContextSpi#engineCreateSSLEngine(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLContextSpi.engineCreateSSLEngine(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml
index 848b427a9e..1151678762 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLEngine.xml
@@ -109,14 +109,13 @@
         <Parameter Name="peerPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="peerHost">To be added.</param>
-        <param name="peerPort">To be added.</param>
-        <summary>Constructor for an &lt;code&gt;SSLEngine&lt;/code&gt; providing no hints
-            for an internal session reuse strategy.</summary>
+        <param name="peerHost">the name of the peer host</param>
+        <param name="peerPort">the port number of the peer</param>
+        <summary>Constructor for an &lt;code&gt;SSLEngine&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#SSLEngine()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.SSLEngine()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#SSLEngine(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.SSLEngine(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1160,18 +1159,17 @@
         <Parameter Name="dsts" Type="Java.Nio.ByteBuffer[]" />
       </Parameters>
       <Docs>
-        <param name="dsts">the array of destination buffers for incoming application
-            data.</param>
         <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing inbound network data.</param>
-        <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold inbound application data.</param>
-        <summary>Attempts to decode SSL/TLS network data into a plaintext
-            application data buffer.</summary>
+        <param name="dsts">an array of &lt;code&gt;ByteBuffer&lt;/code&gt;s to hold inbound
+                     application data.</param>
+        <summary>Attempts to decode SSL/TLS network data into a sequence of plaintext
+            application data buffers.</summary>
         <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
                      of this operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#unwrap(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#unwrap(java.nio.ByteBuffer,%20java.nio.ByteBuffer[])" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1215,21 +1213,23 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="dsts">the array of destination buffers for incoming application
-            data.</param>
-        <param name="offset">the offset in the array of destination buffers to which data
-            is to be transferred.</param>
-        <param name="length">the maximum number of destination buffers to be used.</param>
         <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing inbound network data.</param>
-        <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold inbound application data.</param>
-        <summary>Attempts to decode SSL/TLS network data into a plaintext
-            application data buffer.</summary>
+        <param name="dsts">an array of &lt;code&gt;ByteBuffer&lt;/code&gt;s to hold inbound
+                     application data.</param>
+        <param name="offset">The offset within the buffer array of the first buffer from
+                     which bytes are to be transferred; it must be non-negative
+                     and no larger than &lt;code&gt;dsts.length&lt;/code&gt;.</param>
+        <param name="length">The maximum number of buffers to be accessed; it must be
+                     non-negative and no larger than
+                     &lt;code&gt;dsts.length&lt;/code&gt;&amp;nbsp;-&amp;nbsp;&lt;code&gt;offset&lt;/code&gt;.</param>
+        <summary>Attempts to decode SSL/TLS network data into a subsequence of
+            plaintext application data buffers.</summary>
         <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
                      of this operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#unwrap(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#unwrap(java.nio.ByteBuffer,%20java.nio.ByteBuffer[],%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1408,17 +1408,17 @@
         <Parameter Name="dst" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="srcs">the array of source buffers of outgoing application data.</param>
-        <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing outbound application data</param>
+        <param name="srcs">an array of &lt;code&gt;ByteBuffers&lt;/code&gt; containing the
+                     outbound application data</param>
         <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold outbound network data</param>
-        <summary>Attempts to encode a buffer of plaintext application data into
-            SSL/TLS network data.</summary>
+        <summary>Attempts to encode plaintext bytes from a sequence of data
+            buffers into SSL/TLS network data.</summary>
         <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
                      of this operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#wrap(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.wrap(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#wrap(java.nio.ByteBuffer[],%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.wrap(java.nio.ByteBuffer[], java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1462,20 +1462,23 @@
         <Parameter Name="dst" Type="Java.Nio.ByteBuffer" />
       </Parameters>
       <Docs>
-        <param name="srcs">the array of source buffers of outgoing application data.</param>
-        <param name="offset">the offset in the array of source buffers from which data is
-            to be retrieved.</param>
-        <param name="length">the maximum number of source buffers to be used.</param>
-        <param name="src">a &lt;code&gt;ByteBuffer&lt;/code&gt; containing outbound application data</param>
+        <param name="srcs">an array of &lt;code&gt;ByteBuffers&lt;/code&gt; containing the
+                     outbound application data</param>
+        <param name="offset">The offset within the buffer array of the first buffer from
+                     which bytes are to be retrieved; it must be non-negative
+                     and no larger than &lt;code&gt;srcs.length&lt;/code&gt;</param>
+        <param name="length">The maximum number of buffers to be accessed; it must be
+                     non-negative and no larger than
+                     &lt;code&gt;srcs.length&lt;/code&gt;&amp;nbsp;-&amp;nbsp;&lt;code&gt;offset&lt;/code&gt;</param>
         <param name="dst">a &lt;code&gt;ByteBuffer&lt;/code&gt; to hold outbound network data</param>
-        <summary>Attempts to encode a buffer of plaintext application data into
-            SSL/TLS network data.</summary>
+        <summary>Attempts to encode plaintext bytes from a subsequence of data
+            buffers into SSL/TLS network data.</summary>
         <returns>an &lt;code&gt;SSLEngineResult&lt;/code&gt; describing the result
                      of this operation.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#wrap(java.nio.ByteBuffer,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.wrap(java.nio.ByteBuffer, java.nio.ByteBuffer)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLEngine#wrap(java.nio.ByteBuffer[],%20int,%20int,%20java.nio.ByteBuffer)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLEngine.wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml
index 32ac100613..6677411c6f 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLException.xml
@@ -54,14 +54,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="reason">describes the problem.</param>
-        <summary>Constructs an exception reporting an error found by
-            an SSL subsystem.</summary>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                     <c>#getCause()</c> method).  (A <c>null</c> value is
+                     permitted, and indicates that the cause is nonexistent or
+                     unknown.)</param>
+        <summary>Creates a &lt;code&gt;SSLException&lt;/code&gt; with the specified cause
+            and a detail message of <c>(cause==null ? null : cause.toString())</c>
+            (which typically contains the class and detail message of
+            <c>cause</c>).</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLException#SSLException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLException.SSLException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLException#SSLException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLException.SSLException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,15 +159,18 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
-        <param name="reason">describes the problem.</param>
-        <summary>Constructs an exception reporting an error found by
-            an SSL subsystem.</summary>
+        <param name="message">the detail message (which is saved for later retrieval
+                     by the <c>#getMessage()</c> method).</param>
+        <param name="cause">the cause (which is saved for later retrieval by the
+                     <c>#getCause()</c> method).  (A <c>null</c> value is
+                     permitted, and indicates that the cause is nonexistent or
+                     unknown.)</param>
+        <summary>Creates a &lt;code&gt;SSLException&lt;/code&gt; with the specified
+            detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLException#SSLException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLException.SSLException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLException#SSLException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLException.SSLException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLParameters.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLParameters.xml
index 858e732c56..31e11fae1c 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLParameters.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLParameters.xml
@@ -87,12 +87,12 @@
         <Parameter Name="cipherSuites" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="cipherSuites">To be added.</param>
-        <summary>Constructs SSLParameters.</summary>
+        <param name="cipherSuites">the array of ciphersuites (or null)</param>
+        <summary>Constructs SSLParameters from the specified array of ciphersuites.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLParameters#SSLParameters()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLParameters.SSLParameters()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLParameters#SSLParameters(java.lang.String[])" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLParameters.SSLParameters(java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -148,13 +148,14 @@
         <Parameter Name="protocols" Type="System.String[]" />
       </Parameters>
       <Docs>
-        <param name="cipherSuites">To be added.</param>
-        <param name="protocols">To be added.</param>
-        <summary>Constructs SSLParameters.</summary>
+        <param name="cipherSuites">the array of ciphersuites (or null)</param>
+        <param name="protocols">the array of protocols (or null)</param>
+        <summary>Constructs SSLParameters from the specified array of ciphersuites
+            and protocols.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLParameters#SSLParameters()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLParameters.SSLParameters()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLParameters#SSLParameters(java.lang.String[],%20java.lang.String[])" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLParameters.SSLParameters(java.lang.String[], java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml
index 2b5ab8e617..e06475ee92 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLServerSocket.xml
@@ -91,12 +91,12 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
+        <param name="port">the port on which to listen</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket#SSLServerSocket()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLServerSocket.SSLServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket#SSLServerSocket(int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLServerSocket.SSLServerSocket(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -131,13 +131,14 @@
         <Parameter Name="backlog" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <param name="backlog">To be added.</param>
+        <param name="port">the port on which to listen</param>
+        <param name="backlog">requested maximum length of the queue of incoming
+                             connections.</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket#SSLServerSocket()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLServerSocket.SSLServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket#SSLServerSocket(int,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLServerSocket.SSLServerSocket(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -196,14 +197,16 @@
         <Parameter Name="address" Type="Java.Net.InetAddress" />
       </Parameters>
       <Docs>
-        <param name="port">To be added.</param>
-        <param name="backlog">To be added.</param>
-        <param name="address">To be added.</param>
+        <param name="port">the port on which to listen</param>
+        <param name="backlog">requested maximum length of the queue of incoming
+                             connections.</param>
+        <param name="address">the address of the network interface through
+                     which connections will be accepted</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket#SSLServerSocket()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLServerSocket.SSLServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket#SSLServerSocket(int,%20int,%20java.net.InetAddress)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLServerSocket.SSLServerSocket(int, int, java.net.InetAddress)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml
index 004aeeec13..e38760560c 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocket.xml
@@ -85,13 +85,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">To be added.</param>
-        <param name="port">To be added.</param>
+        <param name="address">the server's host</param>
+        <param name="port">its port</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket(java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket(java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -149,13 +149,14 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
+        <param name="host">name of the host with which to connect, or
+                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+        <param name="port">number of the server's port</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -193,15 +194,17 @@
         <Parameter Name="clientPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="clientAddress">To be added.</param>
-        <param name="clientPort">To be added.</param>
+        <param name="address">the server's host</param>
+        <param name="port">its port</param>
+        <param name="clientAddress">the client's address the socket is bound to, or
+                   &lt;code&gt;null&lt;/code&gt; for the &lt;code&gt;anyLocal&lt;/code&gt; address.</param>
+        <param name="clientPort">the client's port the socket is bound to, or
+                   &lt;code&gt;zero&lt;/code&gt; for a system selected free port.</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket(java.net.InetAddress,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket(java.net.InetAddress, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -238,15 +241,18 @@
         <Parameter Name="clientPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">To be added.</param>
-        <param name="port">To be added.</param>
-        <param name="clientAddress">To be added.</param>
-        <param name="clientPort">To be added.</param>
+        <param name="host">name of the host with which to connect, or
+                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+        <param name="port">number of the server's port</param>
+        <param name="clientAddress">the client's address the socket is bound to, or
+                   &lt;code&gt;null&lt;/code&gt; for the &lt;code&gt;anyLocal&lt;/code&gt; address.</param>
+        <param name="clientPort">the client's port the socket is bound to, or
+                   &lt;code&gt;zero&lt;/code&gt; for a system selected free port.</param>
         <summary>Used only by subclasses.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket()" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocket#SSLSocket(java.lang.String,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocket.SSLSocket(java.lang.String, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml
index 3f447ba63e..ffe131970e 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/SSLSocketFactory.xml
@@ -116,18 +116,24 @@
         <Parameter Name="autoClose" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="s">the socket.</param>
-        <param name="host">the host.</param>
-        <param name="port">the port number.</param>
-        <param name="autoClose">
-          <c>true</c> if socket <c>s</c> should be closed when the
-            created socket is closed, <c>false</c> if the socket
-            <c>s</c> should be left open.</param>
-        <summary>Creates an <c>SSLSocket</c> over the specified socket that is connected
- to the specified host at the specified port.</summary>
-        <returns>To be added.</returns>
+        <param name="s">the existing socket</param>
+        <param name="host">the server host</param>
+        <param name="port">the server port</param>
+        <param name="autoClose">close the underlying socket when this socket is closed</param>
+        <summary>Returns a socket layered over an existing socket connected to the named
+            host, at the given port.</summary>
+        <returns>a socket connected to the specified host and port</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/javax/net/ssl/SSLSocketFactory#createSocket(java.net.Socket,%20java.lang.String,%20int,%20boolean)" title="Reference documentation">Java documentation for <code>javax.net.ssl.SSLSocketFactory.createSocket(java.net.Socket, java.lang.String, int, boolean)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 1" />
         <exception cref="T:Java.IO.IOException">if creating the socket fails.</exception>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml
index 5cce7ec172..bf90b782fa 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactory.xml
@@ -251,19 +251,19 @@
         <Parameter Name="provider" Type="Java.Security.Provider" />
       </Parameters>
       <Docs>
-        <param name="provider">the provider that provides the requested algorithm.</param>
         <param name="algorithm">the standard name of the requested trust management
                      algorithm.  See the &lt;a href=
              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html"&gt;
                      Java Secure Socket Extension Reference Guide &lt;/a&gt;
                      for information about standard algorithm names.</param>
+        <param name="provider">an instance of the provider.</param>
         <summary>Returns a &lt;code&gt;TrustManagerFactory&lt;/code&gt; object that acts as a
             factory for trust managers.</summary>
         <returns>the new &lt;code&gt;TrustManagerFactory&lt;/code&gt; object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory#getInstance(java.lang.String,%20java.security.Provider)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactory.getInstance(java.lang.String, java.security.Provider)</code>.</a>
             </format>
           </para>
           <para>
@@ -304,20 +304,19 @@
         <Parameter Name="provider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="provider">the name of the provider that provides the requested
-            algorithm.</param>
         <param name="algorithm">the standard name of the requested trust management
                      algorithm.  See the &lt;a href=
              "https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html"&gt;
                      Java Secure Socket Extension Reference Guide &lt;/a&gt;
                      for information about standard algorithm names.</param>
+        <param name="provider">the name of the provider.</param>
         <summary>Returns a &lt;code&gt;TrustManagerFactory&lt;/code&gt; object that acts as a
             factory for trust managers.</summary>
-        <returns>the new &lt;code&gt;TrustManagerFactory&lt;/code&gt; object.</returns>
+        <returns>the new &lt;code&gt;TrustManagerFactory&lt;/code&gt; object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory#getInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactory.getInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory#getInstance(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactory.getInstance(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -439,14 +438,14 @@
         <Parameter Name="spec" Type="Javax.Net.Ssl.IManagerFactoryParameters" />
       </Parameters>
       <Docs>
-        <param name="spec">the provider-specific parameters.</param>
-        <param name="ks">the key store, or null</param>
-        <summary>Initializes this factory with a source of certificate
-            authorities and related trust material.</summary>
+        <param name="spec">an implementation of a provider-specific parameter
+                     specification</param>
+        <summary>Initializes this factory with a source of provider-specific
+            trust material.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory#init(java.security.KeyStore)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactory.init(java.security.KeyStore)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory#init(javax.net.ssl.ManagerFactoryParameters)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactory.init(javax.net.ssl.ManagerFactoryParameters)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml
index 096c7b5fea..276e2a2fcf 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/TrustManagerFactorySpi.xml
@@ -186,14 +186,14 @@
         <Parameter Name="spec" Type="Javax.Net.Ssl.IManagerFactoryParameters" />
       </Parameters>
       <Docs>
-        <param name="spec">the provider-specific parameters.</param>
-        <param name="ks">the key store or null</param>
-        <summary>Initializes this factory with a source of certificate
-            authorities and related trust material.</summary>
+        <param name="spec">an implementation of a provider-specific parameter
+                     specification</param>
+        <summary>Initializes this factory with a source of provider-specific
+            key material.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactorySpi#engineInit(java.security.KeyStore)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactorySpi.engineInit(java.security.KeyStore)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactorySpi#engineInit(javax.net.ssl.ManagerFactoryParameters)" title="Reference documentation">Java documentation for <code>javax.net.ssl.TrustManagerFactorySpi.engineInit(javax.net.ssl.ManagerFactoryParameters)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml b/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml
index 1d9c1c4ae5..a075a7c9a8 100644
--- a/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml
+++ b/docs/Mono.Android/en/Javax.Net.Ssl/X509ExtendedTrustManager.xml
@@ -215,10 +215,9 @@
         <Parameter Name="engine" Type="Javax.Net.Ssl.SSLEngine" />
       </Parameters>
       <Docs>
-        <param name="engine">To be added.</param>
         <param name="chain">the peer certificate chain</param>
         <param name="authType">the key exchange algorithm used</param>
-        <param name="socket">the socket used for this connection. This parameter
+        <param name="engine">the engine used for this connection. This parameter
                    can be null, which indicates that implementations need not check
                    the ssl parameters</param>
         <summary>Given the partial or complete certificate chain provided by the
@@ -227,7 +226,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager#checkClientTrusted(java.security.cert.X509Certificate[],%20java.lang.String,%20java.net.Socket)" title="Reference documentation">Java documentation for <code>javax.net.ssl.X509ExtendedTrustManager.checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager#checkClientTrusted(java.security.cert.X509Certificate[],%20java.lang.String,%20javax.net.ssl.SSLEngine)" title="Reference documentation">Java documentation for <code>javax.net.ssl.X509ExtendedTrustManager.checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine)</code>.</a>
             </format>
           </para>
           <para>
@@ -357,10 +356,9 @@
         <Parameter Name="engine" Type="Javax.Net.Ssl.SSLEngine" />
       </Parameters>
       <Docs>
-        <param name="engine">To be added.</param>
         <param name="chain">the peer certificate chain</param>
         <param name="authType">the key exchange algorithm used</param>
-        <param name="socket">the socket used for this connection. This parameter
+        <param name="engine">the engine used for this connection. This parameter
                    can be null, which indicates that implementations need not check
                    the ssl parameters</param>
         <summary>Given the partial or complete certificate chain provided by the
@@ -369,7 +367,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager#checkServerTrusted(java.security.cert.X509Certificate[],%20java.lang.String,%20java.net.Socket)" title="Reference documentation">Java documentation for <code>javax.net.ssl.X509ExtendedTrustManager.checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager#checkServerTrusted(java.security.cert.X509Certificate[],%20java.lang.String,%20javax.net.ssl.SSLEngine)" title="Reference documentation">Java documentation for <code>javax.net.ssl.X509ExtendedTrustManager.checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml b/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml
index 59038c6d80..696e5edc71 100644
--- a/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net/ServerSocketFactory.xml
@@ -153,13 +153,13 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">the port on which the created socket has to listen.</param>
-        <summary>Returns an unbound server socket.</summary>
-        <returns>the unbound socket</returns>
+        <param name="port">the port to listen to</param>
+        <summary>Returns a server socket bound to the specified port.</summary>
+        <returns>the &lt;code&gt;ServerSocket&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ServerSocketFactory#createServerSocket()" title="Reference documentation">Java documentation for <code>javax.net.ServerSocketFactory.createServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ServerSocketFactory#createServerSocket(int)" title="Reference documentation">Java documentation for <code>javax.net.ServerSocketFactory.createServerSocket(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -197,15 +197,15 @@
         <Parameter Name="backlog" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="port">the port on which the created socket has to listen.</param>
-        <param name="backlog">the maximum number of unaccepted connections. Passing 0 or
-     a negative value yields the default backlog of 50.</param>
-        <summary>Returns an unbound server socket.</summary>
-        <returns>the unbound socket</returns>
+        <param name="port">the port to listen to</param>
+        <param name="backlog">how many connections are queued</param>
+        <summary>Returns a server socket bound to the specified port, and uses the
+            specified connection backlog.</summary>
+        <returns>the &lt;code&gt;ServerSocket&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ServerSocketFactory#createServerSocket()" title="Reference documentation">Java documentation for <code>javax.net.ServerSocketFactory.createServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ServerSocketFactory#createServerSocket(int,%20int)" title="Reference documentation">Java documentation for <code>javax.net.ServerSocketFactory.createServerSocket(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -244,16 +244,16 @@
         <Parameter Name="ifAddress" Type="Java.Net.InetAddress" />
       </Parameters>
       <Docs>
-        <param name="port">the port on which the created socket has to listen.</param>
-        <param name="backlog">the maximum number of unaccepted connections. Passing 0 or
-     a negative value yields the default backlog of 50.</param>
-        <param name="ifAddress">To be added.</param>
-        <summary>Returns an unbound server socket.</summary>
-        <returns>the unbound socket</returns>
+        <param name="port">the port to listen to</param>
+        <param name="backlog">how many connections are queued</param>
+        <param name="ifAddress">the network interface address to use</param>
+        <summary>Returns a server socket bound to the specified port,
+            with a specified listen backlog and local IP.</summary>
+        <returns>the &lt;code&gt;ServerSocket&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/ServerSocketFactory#createServerSocket()" title="Reference documentation">Java documentation for <code>javax.net.ServerSocketFactory.createServerSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/ServerSocketFactory#createServerSocket(int,%20int,%20java.net.InetAddress)" title="Reference documentation">Java documentation for <code>javax.net.ServerSocketFactory.createServerSocket(int, int, java.net.InetAddress)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Net/SocketFactory.xml b/docs/Mono.Android/en/Javax.Net/SocketFactory.xml
index b9b190c25f..c97ae8bff3 100644
--- a/docs/Mono.Android/en/Javax.Net/SocketFactory.xml
+++ b/docs/Mono.Android/en/Javax.Net/SocketFactory.xml
@@ -154,15 +154,15 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">the host address the socket has to be connected to.</param>
-        <param name="port">the port number of the remote host at which the socket is
-            connected.</param>
-        <summary>Creates an unconnected socket.</summary>
-        <returns>the unconnected socket</returns>
+        <param name="host">the server host</param>
+        <param name="port">the server port</param>
+        <summary>Creates a socket and connects it to the specified port number
+            at the specified address.</summary>
+        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket(java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket(java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -200,15 +200,16 @@
         <Parameter Name="port" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">the remote host address the socket has to be connected to.</param>
-        <param name="port">the port number of the remote host at which the socket is
-            connected.</param>
-        <summary>Creates an unconnected socket.</summary>
-        <returns>the unconnected socket</returns>
+        <param name="host">the server host name with which to connect, or
+                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+        <param name="port">the server port</param>
+        <summary>Creates a socket and connects it to the specified remote host
+            at the specified remote port.</summary>
+        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -250,18 +251,17 @@
         <Parameter Name="localPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="address">the remote host address the socket has to be connected to.</param>
-        <param name="port">the port number of the remote host at which the socket is
-            connected.</param>
-        <param name="localAddress">the local host address the socket is bound to.</param>
-        <param name="localPort">the port number of the local host at which the socket is
-            bound.</param>
-        <summary>Creates an unconnected socket.</summary>
-        <returns>the unconnected socket</returns>
+        <param name="address">the server network address</param>
+        <param name="port">the server port</param>
+        <param name="localAddress">the client network address</param>
+        <param name="localPort">the client port</param>
+        <summary>Creates a socket and connect it to the specified remote address
+            on the specified remote port.</summary>
+        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket(java.net.InetAddress,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket(java.net.InetAddress, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -301,18 +301,18 @@
         <Parameter Name="localPort" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="host">the remote host address the socket has to be connected to.</param>
-        <param name="port">the port number of the remote host at which the socket is
-            connected.</param>
-        <param name="localHost">the local host address the socket is bound to.</param>
-        <param name="localPort">the port number of the local host at which the socket is
-            bound.</param>
-        <summary>Creates an unconnected socket.</summary>
-        <returns>the unconnected socket</returns>
+        <param name="host">the server host name with which to connect, or
+                   &lt;code&gt;null&lt;/code&gt; for the loopback address.</param>
+        <param name="port">the server port</param>
+        <param name="localHost">the local address the socket is bound to</param>
+        <param name="localPort">the local port the socket is bound to</param>
+        <summary>Creates a socket and connects it to the specified remote host
+            on the specified remote port.</summary>
+        <returns>the &lt;code&gt;Socket&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket()" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/net/SocketFactory#createSocket(java.lang.String,%20int,%20java.net.InetAddress,%20int)" title="Reference documentation">Java documentation for <code>javax.net.SocketFactory.createSocket(java.lang.String, int, java.net.InetAddress, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Auth.Callback/UnsupportedCallbackException.xml b/docs/Mono.Android/en/Javax.Security.Auth.Callback/UnsupportedCallbackException.xml
index 6a091963fe..23363e2435 100644
--- a/docs/Mono.Android/en/Javax.Security.Auth.Callback/UnsupportedCallbackException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Auth.Callback/UnsupportedCallbackException.xml
@@ -94,14 +94,14 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="callback">the unrecognized <c>Callback</c>.</param>
-        <summary>Constructs a <c>UnsupportedCallbackException</c>
-            with no detail message.</summary>
+        <param name="callback">the unrecognized <c>Callback</c>. &lt;p&gt;</param>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a UnsupportedCallbackException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/callback/UnsupportedCallbackException#UnsupportedCallbackException(javax.security.auth.callback.Callback)" title="Reference documentation">Java documentation for <code>javax.security.auth.callback.UnsupportedCallbackException.UnsupportedCallbackException(javax.security.auth.callback.Callback)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/callback/UnsupportedCallbackException#UnsupportedCallbackException(javax.security.auth.callback.Callback,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.auth.callback.UnsupportedCallbackException.UnsupportedCallbackException(javax.security.auth.callback.Callback, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Auth.Login/LoginException.xml b/docs/Mono.Android/en/Javax.Security.Auth.Login/LoginException.xml
index 348de4b7b2..745e0a4366 100644
--- a/docs/Mono.Android/en/Javax.Security.Auth.Login/LoginException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Auth.Login/LoginException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a LoginException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a LoginException with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/login/LoginException#LoginException()" title="Reference documentation">Java documentation for <code>javax.security.auth.login.LoginException.LoginException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/login/LoginException#LoginException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.auth.login.LoginException.LoginException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Auth.X500/X500Principal.xml b/docs/Mono.Android/en/Javax.Security.Auth.X500/X500Principal.xml
index c120f7fcd5..f0719ca2ce 100644
--- a/docs/Mono.Android/en/Javax.Security.Auth.X500/X500Principal.xml
+++ b/docs/Mono.Android/en/Javax.Security.Auth.X500/X500Principal.xml
@@ -70,12 +70,14 @@
         <Parameter Name="name" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Creates an X500Principal by wrapping an X500Name.</summary>
+        <param name="name">a byte array containing the distinguished name in ASN.1
+            DER encoded form</param>
+        <summary>Creates an <c>X500Principal</c> from a distinguished name in
+            ASN.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(.*X500Name)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(.*X500Name)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(byte[])" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -109,12 +111,14 @@
         <Parameter Name="is" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="is">To be added.</param>
-        <summary>Creates an X500Principal by wrapping an X500Name.</summary>
+        <param name="is">an <c>InputStream</c> containing the distinguished
+                     name in ASN.1 DER encoded form</param>
+        <summary>Creates an <c>X500Principal</c> from an <c>InputStream</c>
+            containing the distinguished name in ASN.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(.*X500Name)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(.*X500Name)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -148,12 +152,13 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>Creates an X500Principal by wrapping an X500Name.</summary>
+        <param name="name">an X.500 distinguished name in RFC 1779 or RFC 2253 format</param>
+        <summary>Creates an <c>X500Principal</c> from a string representation of
+            an X.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(.*X500Name)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(.*X500Name)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -189,13 +194,17 @@
         <Parameter Name="keywordMap" Type="System.Collections.Generic.IDictionary&lt;System.String,System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="keywordMap">To be added.</param>
-        <summary>Creates an X500Principal by wrapping an X500Name.</summary>
+        <param name="name">an X.500 distinguished name in RFC 1779 or RFC 2253 format</param>
+        <param name="keywordMap">an attribute type keyword map, where each key is a
+              keyword String that maps to a corresponding object identifier in String
+              form (a sequence of nonnegative integers separated by periods). The map
+              may be empty but never <c>null</c>.</param>
+        <summary>Creates an <c>X500Principal</c> from a string representation of
+            an X.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(.*X500Name)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(.*X500Name)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#X500Principal(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.X500Principal(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -308,13 +317,14 @@
         <Parameter Name="format" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="format">the name of the format to use for the representation</param>
+        <param name="format">the format to use</param>
         <summary>Returns a string representation of the X.</summary>
-        <returns>the distinguished name of this <c>X500Principal</c></returns>
+        <returns>a string representation of this <c>X500Principal</c>
+                     using the specified format</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#getName()" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.getName()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#getName(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.getName(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -353,14 +363,18 @@
         <Parameter Name="oidMap" Type="System.Collections.Generic.IDictionary&lt;System.String,System.String&gt;" />
       </Parameters>
       <Docs>
-        <param name="format">To be added.</param>
-        <param name="oidMap">To be added.</param>
+        <param name="format">the format to use</param>
+        <param name="oidMap">an OID map, where each key is an object identifier in
+             String form (a sequence of nonnegative integers separated by periods)
+             that maps to a corresponding attribute type keyword String.
+             The map may be empty but never <c>null</c>.</param>
         <summary>Returns a string representation of the X.</summary>
-        <returns>the distinguished name of this <c>X500Principal</c></returns>
+        <returns>a string representation of this <c>X500Principal</c>
+                     using the specified format</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#getName()" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.getName()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal#getName(java.lang.String,%20java.util.Map)" title="Reference documentation">Java documentation for <code>javax.security.auth.x500.X500Principal.getName(java.lang.String, java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Auth/DestroyFailedException.xml b/docs/Mono.Android/en/Javax.Security.Auth/DestroyFailedException.xml
index 8c4e52be32..cd43eb4808 100644
--- a/docs/Mono.Android/en/Javax.Security.Auth/DestroyFailedException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Auth/DestroyFailedException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a DestroyFailedException with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a DestroyFailedException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/DestroyFailedException#DestroyFailedException()" title="Reference documentation">Java documentation for <code>javax.security.auth.DestroyFailedException.DestroyFailedException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/DestroyFailedException#DestroyFailedException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.auth.DestroyFailedException.DestroyFailedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Auth/Subject.xml b/docs/Mono.Android/en/Javax.Security.Auth/Subject.xml
index deae3fc38d..f3f5f7ae8f 100644
--- a/docs/Mono.Android/en/Javax.Security.Auth/Subject.xml
+++ b/docs/Mono.Android/en/Javax.Security.Auth/Subject.xml
@@ -106,17 +106,20 @@
         <Parameter Name="privCredentials" Type="System.Collections.Generic.ICollection&lt;System.Object&gt;" />
       </Parameters>
       <Docs>
-        <param name="readOnly">To be added.</param>
-        <param name="principals">To be added.</param>
-        <param name="pubCredentials">To be added.</param>
-        <param name="privCredentials">To be added.</param>
-        <summary>Create an instance of a <c>Subject</c>
-            with an empty <c>Set</c> of Principals and empty
-            Sets of public and private credentials.</summary>
+        <param name="readOnly">true if the <c>Subject</c> is to be read-only,
+                     and false otherwise. &lt;p&gt;</param>
+        <param name="principals">the <c>Set</c> of Principals
+                     to be associated with this <c>Subject</c>. &lt;p&gt;</param>
+        <param name="pubCredentials">the <c>Set</c> of public credentials
+                     to be associated with this <c>Subject</c>. &lt;p&gt;</param>
+        <param name="privCredentials">the <c>Set</c> of private credentials
+                     to be associated with this <c>Subject</c>.</param>
+        <summary>Create an instance of a <c>Subject</c> with
+            Principals and credentials.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/Subject#Subject()" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.Subject()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/Subject#Subject(boolean,%20java.util.Set,%20java.util.Set,%20java.util.Set)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.Subject(boolean, java.util.Set, java.util.Set, java.util.Set)</code>.</a>
             </format>
           </para>
           <para>
@@ -210,17 +213,17 @@
         <param name="subject">the <c>Subject</c> that the specified
                              <c>action</c> will run as.  This parameter
                              may be <c>null</c>. &lt;p&gt;</param>
-        <param name="&lt;T&gt;&lt;T&gt;">the type of the value returned by the PrivilegedAction's
-                             <c>run</c> method.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the value returned by the
+                             PrivilegedExceptionAction's <c>run</c> method.</param>
         <param name="action">the code to be run as the specified
                              <c>Subject</c>. &lt;p&gt;</param>
         <summary>Perform work as a particular <c>Subject</c>.</summary>
-        <returns>the value returned by the PrivilegedAction's
-                             <c>run</c> method.</returns>
+        <returns>the value returned by the
+                             PrivilegedExceptionAction's <c>run</c> method.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/Subject#doAs(javax.security.auth.Subject,%20java.security.PrivilegedAction)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.doAs(javax.security.auth.Subject, java.security.PrivilegedAction)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/Subject#doAs(javax.security.auth.Subject,%20java.security.PrivilegedExceptionAction)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.doAs(javax.security.auth.Subject, java.security.PrivilegedExceptionAction)</code>.</a>
             </format>
           </para>
           <para>
@@ -318,19 +321,19 @@
         <param name="subject">the <c>Subject</c> that the specified
                              <c>action</c> will run as.  This parameter
                              may be <c>null</c>. &lt;p&gt;</param>
-        <param name="&lt;T&gt;&lt;T&gt;">the type of the value returned by the PrivilegedAction's
-                             <c>run</c> method.</param>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the value returned by the
+                             PrivilegedExceptionAction's <c>run</c> method.</param>
         <param name="action">the code to be run as the specified
                              <c>Subject</c>. &lt;p&gt;</param>
         <param name="acc">the <c>AccessControlContext</c> to be tied to the
                              specified <i>subject</i> and <i>action</i>. &lt;p&gt;</param>
         <summary>Perform privileged work as a particular <c>Subject</c>.</summary>
-        <returns>the value returned by the PrivilegedAction's
-                             <c>run</c> method.</returns>
+        <returns>the value returned by the
+                             PrivilegedExceptionAction's <c>run</c> method.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/Subject#doAsPrivileged(javax.security.auth.Subject,%20java.security.PrivilegedAction,%20java.security.AccessControlContext)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.doAsPrivileged(javax.security.auth.Subject, java.security.PrivilegedAction, java.security.AccessControlContext)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/Subject#doAsPrivileged(javax.security.auth.Subject,%20java.security.PrivilegedExceptionAction,%20java.security.AccessControlContext)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.doAsPrivileged(javax.security.auth.Subject, java.security.PrivilegedExceptionAction, java.security.AccessControlContext)</code>.</a>
             </format>
           </para>
           <para>
@@ -368,15 +371,18 @@
         <Parameter Name="c" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Return the <c>Set</c> of Principals associated with this
-            <c>Subject</c>.</summary>
-        <returns>The <c>Set</c> of Principals associated with this
-                     <c>Subject</c>.</returns>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the class modeled by <c>c</c></param>
+        <param name="c">the returned <c>Set</c> of Principals will all be
+                     instances of this class.</param>
+        <summary>Return a <c>Set</c> of Principals associated with this
+            <c>Subject</c> that are instances or subclasses of the specified
+            <c>Class</c>.</summary>
+        <returns>a <c>Set</c> of Principals that are instances of the
+                     specified <c>Class</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/Subject#getPrincipals()" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.getPrincipals()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/Subject#getPrincipals(java.lang.Class)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.getPrincipals(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -414,15 +420,18 @@
         <Parameter Name="c" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Return the <c>Set</c> of private credentials held by this
-            <c>Subject</c>.</summary>
-        <returns>A <c>Set</c> of private credentials held by this
-                     <c>Subject</c>.</returns>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the class modeled by <c>c</c></param>
+        <param name="c">the returned <c>Set</c> of private credentials will all be
+                     instances of this class.</param>
+        <summary>Return a <c>Set</c> of private credentials associated with this
+            <c>Subject</c> that are instances or subclasses of the specified
+            <c>Class</c>.</summary>
+        <returns>a <c>Set</c> of private credentials that are instances
+                     of the  specified <c>Class</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/Subject#getPrivateCredentials()" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.getPrivateCredentials()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/Subject#getPrivateCredentials(java.lang.Class)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.getPrivateCredentials(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
@@ -460,15 +469,18 @@
         <Parameter Name="c" Type="Java.Lang.Class" />
       </Parameters>
       <Docs>
-        <param name="c">To be added.</param>
-        <summary>Return the <c>Set</c> of public credentials held by this
-            <c>Subject</c>.</summary>
-        <returns>A <c>Set</c> of public credentials held by this
-                     <c>Subject</c>.</returns>
+        <param name="&lt;T&gt;&lt;T&gt;">the type of the class modeled by <c>c</c></param>
+        <param name="c">the returned <c>Set</c> of public credentials will all be
+                     instances of this class.</param>
+        <summary>Return a <c>Set</c> of public credentials associated with this
+            <c>Subject</c> that are instances or subclasses of the specified
+            <c>Class</c>.</summary>
+        <returns>a <c>Set</c> of public credentials that are instances
+                     of the  specified <c>Class</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/auth/Subject#getPublicCredentials()" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.getPublicCredentials()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/auth/Subject#getPublicCredentials(java.lang.Class)" title="Reference documentation">Java documentation for <code>javax.security.auth.Subject.getPublicCredentials(java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Cert/Certificate.xml b/docs/Mono.Android/en/Javax.Security.Cert/Certificate.xml
index 27e70de87f..83469a0c2b 100644
--- a/docs/Mono.Android/en/Javax.Security.Cert/Certificate.xml
+++ b/docs/Mono.Android/en/Javax.Security.Cert/Certificate.xml
@@ -351,14 +351,14 @@
         <Parameter Name="sigProvider" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="sigProvider">the name of the signature provider.</param>
         <param name="key">the PublicKey used to carry out the verification.</param>
+        <param name="sigProvider">the name of the signature provider.</param>
         <summary>Verifies that this certificate was signed using the
             private key that corresponds to the specified public key.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/Certificate#verify(java.security.PublicKey)" title="Reference documentation">Java documentation for <code>javax.security.cert.Certificate.verify(java.security.PublicKey)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/Certificate#verify(java.security.PublicKey,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.cert.Certificate.verify(java.security.PublicKey, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Cert/CertificateEncodingException.xml b/docs/Mono.Android/en/Javax.Security.Cert/CertificateEncodingException.xml
index 3edc268cce..cb4a0581ff 100644
--- a/docs/Mono.Android/en/Javax.Security.Cert/CertificateEncodingException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Cert/CertificateEncodingException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateEncodingException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateEncodingException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/CertificateEncodingException#CertificateEncodingException()" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateEncodingException.CertificateEncodingException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/CertificateEncodingException#CertificateEncodingException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateEncodingException.CertificateEncodingException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Cert/CertificateException.xml b/docs/Mono.Android/en/Javax.Security.Cert/CertificateException.xml
index 58659177ab..9a066a3820 100644
--- a/docs/Mono.Android/en/Javax.Security.Cert/CertificateException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Cert/CertificateException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Constructs a certificate exception with no detail message.</summary>
+        <param name="msg">the detail message.</param>
+        <summary>Constructs a certificate exception with the given detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/CertificateException#CertificateException()" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateException.CertificateException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/CertificateException#CertificateException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateException.CertificateException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Cert/CertificateExpiredException.xml b/docs/Mono.Android/en/Javax.Security.Cert/CertificateExpiredException.xml
index f80dc2a565..a3ec67f4a5 100644
--- a/docs/Mono.Android/en/Javax.Security.Cert/CertificateExpiredException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Cert/CertificateExpiredException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateExpiredException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateExpiredException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/CertificateExpiredException#CertificateExpiredException()" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateExpiredException.CertificateExpiredException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/CertificateExpiredException#CertificateExpiredException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateExpiredException.CertificateExpiredException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Cert/CertificateNotYetValidException.xml b/docs/Mono.Android/en/Javax.Security.Cert/CertificateNotYetValidException.xml
index 7da92e819e..e71d166667 100644
--- a/docs/Mono.Android/en/Javax.Security.Cert/CertificateNotYetValidException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Cert/CertificateNotYetValidException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateNotYetValidException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateNotYetValidException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/CertificateNotYetValidException#CertificateNotYetValidException()" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateNotYetValidException.CertificateNotYetValidException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/CertificateNotYetValidException#CertificateNotYetValidException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateNotYetValidException.CertificateNotYetValidException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Cert/CertificateParsingException.xml b/docs/Mono.Android/en/Javax.Security.Cert/CertificateParsingException.xml
index a3cd15eef2..76626231bf 100644
--- a/docs/Mono.Android/en/Javax.Security.Cert/CertificateParsingException.xml
+++ b/docs/Mono.Android/en/Javax.Security.Cert/CertificateParsingException.xml
@@ -87,12 +87,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Constructs a CertificateParsingException with no detail message.</summary>
+        <param name="message">the detail message.</param>
+        <summary>Constructs a CertificateParsingException with the specified detail
+            message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/CertificateParsingException#CertificateParsingException()" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateParsingException.CertificateParsingException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/CertificateParsingException#CertificateParsingException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.security.cert.CertificateParsingException.CertificateParsingException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Security.Cert/X509Certificate.xml b/docs/Mono.Android/en/Javax.Security.Cert/X509Certificate.xml
index 75c5983362..59c0055715 100644
--- a/docs/Mono.Android/en/Javax.Security.Cert/X509Certificate.xml
+++ b/docs/Mono.Android/en/Javax.Security.Cert/X509Certificate.xml
@@ -144,12 +144,14 @@
         <Parameter Name="date" Type="Java.Util.Date" />
       </Parameters>
       <Docs>
-        <param name="date">the date to check the validity against.</param>
-        <summary>Checks that the certificate is currently valid.</summary>
+        <param name="date">the Date to check against to see if this certificate
+                   is valid at that date/time.</param>
+        <summary>Checks that the specified date is within the certificate's
+            validity period.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/X509Certificate#checkValidity()" title="Reference documentation">Java documentation for <code>javax.security.cert.X509Certificate.checkValidity()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/X509Certificate#checkValidity(java.util.Date)" title="Reference documentation">Java documentation for <code>javax.security.cert.X509Certificate.checkValidity(java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -187,17 +189,16 @@
         <Parameter Name="certData" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="certData">byte array containing data to initialize the certificate.</param>
-        <param name="inStream">an input stream with the data to be read to
-                   initialize the certificate.</param>
+        <param name="certData">a byte array containing the DER-encoded
+                   certificate.</param>
         <summary>Instantiates an X509Certificate object, and initializes it with
-            the data read from the input stream <c>inStream</c>.</summary>
+            the specified byte array.</summary>
         <returns>an X509Certificate object initialized with the data
-                    from the input stream.</returns>
+                    from <c>certData</c>.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/security/cert/X509Certificate#getInstance(java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.security.cert.X509Certificate.getInstance(java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/security/cert/X509Certificate#getInstance(byte[])" title="Reference documentation">Java documentation for <code>javax.security.cert.X509Certificate.getInstance(byte[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml b/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml
index 3b6f207952..5752f88de1 100644
--- a/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml
+++ b/docs/Mono.Android/en/Javax.Sql/ConnectionEvent.xml
@@ -107,14 +107,15 @@
         <Parameter Name="ex" Type="Java.Sql.SQLException" />
       </Parameters>
       <Docs>
-        <param name="ex">To be added.</param>
         <param name="con">the pooled connection that is the source of the event</param>
+        <param name="ex">the SQLException about to be thrown to the application</param>
         <summary>Constructs a &lt;code&gt;ConnectionEvent&lt;/code&gt; object initialized with
-            the given &lt;code&gt;PooledConnection&lt;/code&gt; object.</summary>
+            the given &lt;code&gt;PooledConnection&lt;/code&gt; object and
+            &lt;code&gt;SQLException&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/ConnectionEvent#ConnectionEvent(javax.sql.PooledConnection)" title="Reference documentation">Java documentation for <code>javax.sql.ConnectionEvent.ConnectionEvent(javax.sql.PooledConnection)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/ConnectionEvent#ConnectionEvent(javax.sql.PooledConnection,%20java.sql.SQLException)" title="Reference documentation">Java documentation for <code>javax.sql.ConnectionEvent.ConnectionEvent(javax.sql.PooledConnection, java.sql.SQLException)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml b/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml
index 913665fd84..00294c80da 100644
--- a/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IConnectionPoolDataSource.xml
@@ -69,8 +69,8 @@
         <Parameter Name="password" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="user">To be added.</param>
-        <param name="password">To be added.</param>
+        <param name="user">the database user on whose behalf the connection is being made</param>
+        <param name="password">the user's password</param>
         <summary>Attempts to establish a physical database connection that can
             be used as a pooled connection.</summary>
         <returns>a &lt;code&gt;PooledConnection&lt;/code&gt; object that is a physical
@@ -79,7 +79,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource#getPooledConnection()" title="Reference documentation">Java documentation for <code>javax.sql.ConnectionPoolDataSource.getPooledConnection()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource#getPooledConnection(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.ConnectionPoolDataSource.getPooledConnection(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/IDataSource.xml b/docs/Mono.Android/en/Javax.Sql/IDataSource.xml
index da7b7d2ec1..4f3a76952f 100644
--- a/docs/Mono.Android/en/Javax.Sql/IDataSource.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IDataSource.xml
@@ -102,15 +102,16 @@
         <Parameter Name="password" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="username">To be added.</param>
-        <param name="password">To be added.</param>
+        <param name="username">the database user on whose behalf the connection is
+             being made</param>
+        <param name="password">the user's password</param>
         <summary>Attempts to establish a connection with the data source that
             this &lt;code&gt;DataSource&lt;/code&gt; object represents.</summary>
         <returns>a connection to the data source</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/DataSource#getConnection()" title="Reference documentation">Java documentation for <code>javax.sql.DataSource.getConnection()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/DataSource#getConnection(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.DataSource.getConnection(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/IRowSet.xml b/docs/Mono.Android/en/Javax.Sql/IRowSet.xml
index 49c24fdd13..54ca26a44a 100644
--- a/docs/Mono.Android/en/Javax.Sql/IRowSet.xml
+++ b/docs/Mono.Android/en/Javax.Sql/IRowSet.xml
@@ -648,15 +648,13 @@
         <Parameter Name="x" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given input stream.</summary>
+        <summary>Sets the designated parameter to the given input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setAsciiStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setAsciiStream(java.lang.String, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -695,15 +693,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data in bytes.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
+        <param name="length">the number of bytes in the stream</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given input stream.</summary>
+            to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setAsciiStream(int,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setAsciiStream(int, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -742,16 +740,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="length">the length of the data in bytes</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the Java input stream that contains the ASCII parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setAsciiStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setAsciiStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setAsciiStream(java.lang.String,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setAsciiStream(java.lang.String, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -834,15 +831,14 @@
         <Parameter Name="x" Type="Java.Math.BigDecimal" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given
+            &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBigDecimal(int,%20java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBigDecimal(int, java.math.BigDecimal)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBigDecimal(java.lang.String,%20java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBigDecimal(java.lang.String, java.math.BigDecimal)</code>.</a>
             </format>
           </para>
           <para>
@@ -925,15 +921,13 @@
         <Parameter Name="x" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given input stream.</summary>
+        <summary>Sets the designated parameter to the given input stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBinaryStream(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBinaryStream(java.lang.String, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -972,15 +966,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data in bytes.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
+        <param name="length">the number of bytes in the stream</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given input stream.</summary>
+            to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBinaryStream(int,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBinaryStream(int, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1019,16 +1013,15 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="length">the length of the data in bytes</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the java input stream which contains the binary parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given input stream.</summary>
+        <param name="length">the number of bytes in the stream</param>
+        <summary>Sets the designated parameter to the given input stream, which will have
+            the specified number of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBinaryStream(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBinaryStream(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBinaryStream(java.lang.String,%20java.io.InputStream,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBinaryStream(java.lang.String, java.io.InputStream, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1066,17 +1059,14 @@
         <Parameter Name="x" Type="Java.Sql.IBlob" />
       </Parameters>
       <Docs>
-        <param name="i">To be added.</param>
-        <param name="x">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1,
-            the second is 2, ...</param>
-        <param name="inputStream">An object that contains the data to set the parameter
-            value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <param name="i">the first parameter is 1, the second is 2, ...</param>
+        <param name="x">an object representing a BLOB</param>
+        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
+            with the given  &lt;code&gt;Blob&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(int,%20java.sql.Blob)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(int, java.sql.Blob)</code>.</a>
             </format>
           </para>
           <para>
@@ -1160,17 +1150,13 @@
         <Parameter Name="x" Type="Java.Sql.IBlob" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="x">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1,
-            the second is 2, ...</param>
-        <param name="inputStream">An object that contains the data to set the parameter
-            value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="x">a &lt;code&gt;Blob&lt;/code&gt; object that maps an SQL &lt;code&gt;BLOB&lt;/code&gt; value</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(java.lang.String,%20java.sql.Blob)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(java.lang.String, java.sql.Blob)</code>.</a>
             </format>
           </para>
           <para>
@@ -1208,16 +1194,14 @@
         <Parameter Name="inputStream" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="parameterIndex">index of the first parameter is 1,
-            the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(java.lang.String,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(java.lang.String, java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -1256,16 +1240,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data in bytes</param>
         <param name="parameterIndex">index of the first parameter is 1,
             the second is 2, ...</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
+        <param name="length">the number of bytes in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(int,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(int, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1304,17 +1288,16 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="parameterName">the name for parameter</param>
-        <param name="length">the length of the data in bytes</param>
-        <param name="parameterIndex">index of the first parameter is 1,
+        <param name="parameterName">the name of the parameter to be set
             the second is 2, ...</param>
         <param name="inputStream">An object that contains the data to set the parameter
             value to.</param>
+        <param name="length">the number of bytes in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;InputStream&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(int,%20java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(int, java.io.InputStream)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBlob(java.lang.String,%20java.io.InputStream,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBlob(java.lang.String, java.io.InputStream, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1397,15 +1380,13 @@
         <Parameter Name="x" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;boolean&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;boolean&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBoolean(int,%20boolean)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBoolean(int, boolean)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBoolean(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBoolean(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1488,15 +1469,13 @@
         <Parameter Name="x" Type="System.SByte" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;byte&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;byte&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setByte(int,%20byte)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setByte(int, byte)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setByte(java.lang.String,%20byte)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setByte(java.lang.String, byte)</code>.</a>
             </format>
           </para>
           <para>
@@ -1579,15 +1558,13 @@
         <Parameter Name="x" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java array of &lt;code&gt;byte&lt;/code&gt; values.</summary>
+        <summary>Sets the designated parameter to the given Java array of bytes.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBytes(int,%20byte[])" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBytes(int, byte[])</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setBytes(java.lang.String,%20byte[])" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setBytes(java.lang.String, byte[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1672,17 +1649,15 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
                    Unicode data</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;Reader&lt;/code&gt;
+        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
             object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setCharacterStream(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setCharacterStream(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -1721,17 +1696,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data in the <c>Reader</c> in characters.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
-                   Unicode data</param>
+        <param name="reader">the &lt;code&gt;Reader&lt;/code&gt; object that contains the UNICODE data
+                   to be set</param>
+        <param name="length">the number of characters in the stream</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+            to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setCharacterStream(int,%20java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setCharacterStream(int, java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1770,18 +1744,16 @@
         <Parameter Name="length" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="length">the length of the data in the Reader in characters</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that contains the
-                   Unicode data</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;Reader&lt;/code&gt;
-            object.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="reader">the &lt;code&gt;java.io.Reader&lt;/code&gt; object that
+                   contains the UNICODE data used as the designated parameter</param>
+        <param name="length">the number of characters in the stream</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;Reader&lt;/code&gt;
+            object, which is the given number of characters long.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setCharacterStream(java.lang.String,%20java.io.Reader,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setCharacterStream(java.lang.String, java.io.Reader, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1863,15 +1835,14 @@
         <Parameter Name="x" Type="Java.Sql.IClob" />
       </Parameters>
       <Docs>
-        <param name="i">To be added.</param>
-        <param name="x">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="i">the first parameter is 1, the second is 2, ...</param>
+        <param name="x">an object representing a CLOB</param>
+        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
+            with the given  &lt;code&gt;Clob&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(int,%20java.sql.Clob)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(int, java.sql.Clob)</code>.</a>
             </format>
           </para>
           <para>
@@ -1909,14 +1880,13 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -1954,15 +1924,13 @@
         <Parameter Name="x" Type="Java.Sql.IClob" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="x">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="x">a &lt;code&gt;Clob&lt;/code&gt; object that maps an SQL &lt;code&gt;CLOB&lt;/code&gt; value</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(java.lang.String,%20java.sql.Clob)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(java.lang.String, java.sql.Clob)</code>.</a>
             </format>
           </para>
           <para>
@@ -2001,14 +1969,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data in the Reader in characters</param>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2047,15 +2015,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="length">the length of the data in the Reader in characters</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setClob(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setClob(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2183,15 +2150,13 @@
         <Parameter Name="x" Type="Java.Sql.Date" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDate(int,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDate(int, java.sql.Date)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDate(java.lang.String,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDate(java.lang.String, java.sql.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -2230,15 +2195,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">To be added.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object to use for calculating the date</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+            with the given  &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDate(int,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDate(int, java.sql.Date)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDate(int,%20java.sql.Date,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDate(int, java.sql.Date, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2277,16 +2242,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="cal">To be added.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the date</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDate(int,%20java.sql.Date)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDate(int, java.sql.Date)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDate(java.lang.String,%20java.sql.Date,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDate(java.lang.String, java.sql.Date, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -2369,15 +2333,13 @@
         <Parameter Name="x" Type="System.Double" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;double&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;double&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDouble(int,%20double)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDouble(int, double)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setDouble(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setDouble(java.lang.String, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -2460,15 +2422,13 @@
         <Parameter Name="x" Type="System.Single" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;float&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;float&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setFloat(int,%20float)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setFloat(int, float)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setFloat(java.lang.String,%20float)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setFloat(java.lang.String, float)</code>.</a>
             </format>
           </para>
           <para>
@@ -2551,15 +2511,13 @@
         <Parameter Name="x" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;int&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;int&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setInt(int,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setInt(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setInt(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setInt(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -2642,15 +2600,13 @@
         <Parameter Name="x" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;long&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;long&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setLong(int,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setLong(int, long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setLong(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setLong(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2733,15 +2689,13 @@
         <Parameter Name="value" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNCharacterStream(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNCharacterStream(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -2780,15 +2734,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data in the Reader in characters</param>
         <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="length">the number of characters in the parameter data.</param>
+        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNCharacterStream(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNCharacterStream(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2827,16 +2780,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="length">the length of the data in the Reader in characters</param>
-        <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the column to be set</param>
         <param name="value">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="length">the number of characters in the parameter data.</param>
+        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNCharacterStream(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNCharacterStream(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNCharacterStream(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNCharacterStream(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -2918,14 +2869,13 @@
         <Parameter Name="value" Type="Java.Sql.INClob" />
       </Parameters>
       <Docs>
-        <param name="value">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
+        <param name="value">the parameter value</param>
+        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(int,%20java.sql.NClob)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(int, java.sql.NClob)</code>.</a>
             </format>
           </para>
           <para>
@@ -2963,14 +2913,13 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(java.lang.String,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(java.lang.String, java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -3008,15 +2957,13 @@
         <Parameter Name="value" Type="Java.Sql.INClob" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="value">To be added.</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="reader">An object that contains the data to set the parameter value to.</param>
-        <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
+        <param name="parameterName">the name of the column to be set</param>
+        <param name="value">the parameter value</param>
+        <summary>Sets the designated parameter to a &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(java.lang.String,%20java.sql.NClob)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(java.lang.String, java.sql.NClob)</code>.</a>
             </format>
           </para>
           <para>
@@ -3055,14 +3002,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="length">the length of the data in the Reader in characters</param>
         <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(int,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(int, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3101,15 +3048,14 @@
         <Parameter Name="length" Type="System.Int64" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="length">the length of the data in the Reader in characters</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter to be set</param>
         <param name="reader">An object that contains the data to set the parameter value to.</param>
+        <param name="length">the number of characters in the parameter data.</param>
         <summary>Sets the designated parameter to a &lt;code&gt;Reader&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(int,%20java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(int, java.io.Reader)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNClob(java.lang.String,%20java.io.Reader,%20long)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNClob(java.lang.String, java.io.Reader, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -3191,14 +3137,13 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">of the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the column to be set</param>
         <param name="value">the parameter value</param>
         <summary>Sets the designated paramter to the given &lt;code&gt;String&lt;/code&gt; object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNString(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNString(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNString(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNString(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3281,15 +3226,13 @@
         <Parameter Name="sqlType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">a SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's SQL
-            command to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="sqlType">the SQL type code defined in &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNull(int,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNull(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNull(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNull(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3328,18 +3271,17 @@
         <Parameter Name="typeName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="paramIndex">To be added.</param>
-        <param name="typeName">the fully qualified name of an SQL user defined type or the
-            name of the SQL structured type referenced by a <c>REF</c>
-            type. Ignored if the sqlType is not a UDT or REF type.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">a SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="paramIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="typeName">the fully qualified name of an SQL UDT or the type
+                   name of the SQL structured type being referenced by a &lt;code&gt;REF&lt;/code&gt;
+                   type; ignored if the parameter is not a UDT or &lt;code&gt;REF&lt;/code&gt; type</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's SQL
             command to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNull(int,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNull(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNull(int,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNull(int, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3378,18 +3320,16 @@
         <Parameter Name="typeName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="typeName">the fully qualified name of an SQL User Defined Type or the
-            name of the SQL structured type referenced by a REF type.
-            Ignored if the sqlType is not a UDT or REF type.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
-        <param name="sqlType">a SQL type code defined by &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's SQL
-            command to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="sqlType">a value from &lt;code&gt;java.sql.Types&lt;/code&gt;</param>
+        <param name="typeName">the fully-qualified name of an SQL user-defined type;
+                   ignored if the parameter is not a user-defined type or
+                   SQL &lt;code&gt;REF&lt;/code&gt; value</param>
+        <summary>Sets the designated parameter to SQL &lt;code&gt;NULL&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNull(int,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNull(int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setNull(java.lang.String,%20int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setNull(java.lang.String, int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -3472,15 +3412,13 @@
         <Parameter Name="x" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">The first parameter is 1, the second is 2, ...</param>
-        <param name="x">The object containing the input parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with a Java &lt;code&gt;Object&lt;/code&gt;.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="x">the object containing the input parameter value</param>
+        <summary>Sets the value of the designated parameter with the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(java.lang.String, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -3519,15 +3457,16 @@
         <Parameter Name="targetSqlType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="targetSqlType">the SQL type to send to the database, as defined in <c>java.sql.Types</c>.</param>
-        <param name="parameterIndex">The first parameter is 1, the second is 2, ...</param>
-        <param name="x">The object containing the input parameter value</param>
+        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="x">the object containing the input parameter value</param>
+        <param name="targetSqlType">the SQL type (as defined in &lt;code&gt;java.sql.Types&lt;/code&gt;)
+                   to be sent to the database</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
             with a Java &lt;code&gt;Object&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(int,%20java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(int, java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3566,17 +3505,15 @@
         <Parameter Name="targetSqlType" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="targetSqlType">the SQL type to send to the database, as defined in
-            java.sql.Types.</param>
-        <param name="parameterIndex">The first parameter is 1, the second is 2, ...</param>
-        <param name="x">The object containing the input parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with a Java &lt;code&gt;Object&lt;/code&gt;.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="x">the object containing the input parameter value</param>
+        <param name="targetSqlType">the SQL type (as defined in java.sql.Types) to be
+                                 sent to the database</param>
+        <summary>Sets the value of the designated parameter with the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(java.lang.String,%20java.lang.Object,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(java.lang.String, java.lang.Object, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3616,16 +3553,24 @@
         <Parameter Name="scaleOrLength" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="targetSqlType">the SQL type to send to the database, as defined in <c>java.sql.Types</c>.</param>
-        <param name="scaleOrLength">To be added.</param>
-        <param name="parameterIndex">The first parameter is 1, the second is 2, ...</param>
-        <param name="x">The object containing the input parameter value</param>
+        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="x">the object containing the input parameter value</param>
+        <param name="targetSqlType">the SQL type (as defined in &lt;code&gt;java.sql.Types&lt;/code&gt;)
+                   to be sent to the database. The scale argument may further qualify this
+                   type.</param>
+        <param name="scaleOrLength">for &lt;code&gt;java.sql.Types.DECIMAL&lt;/code&gt;
+                     or &lt;code&gt;java.sql.Types.NUMERIC types&lt;/code&gt;,
+                     this is the number of digits after the decimal point. For
+                     Java Object types &lt;code&gt;InputStream&lt;/code&gt; and &lt;code&gt;Reader&lt;/code&gt;,
+                     this is the length
+                     of the data in the stream or reader.  For all other types,
+                     this value will be ignored.</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with a Java &lt;code&gt;Object&lt;/code&gt;.</summary>
+            with the given Java &lt;code&gt;Object&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(int,%20java.lang.Object,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(int, java.lang.Object, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3665,20 +3610,18 @@
         <Parameter Name="scale" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="targetSqlType">the SQL type to send to the database, as defined in
-            java.sql.Types.</param>
-        <param name="scale">the number of digits after the decimal point, for
-            java.sql.Types.DECIMAL and java.sql.Types.NUMERIC types.
-            Ignored for all other types.</param>
-        <param name="parameterIndex">The first parameter is 1, the second is 2, ...</param>
-        <param name="x">The object containing the input parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            with a Java &lt;code&gt;Object&lt;/code&gt;.</summary>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="x">the object containing the input parameter value</param>
+        <param name="targetSqlType">the SQL type (as defined in java.sql.Types) to be
+            sent to the database. The scale argument may further qualify this type.</param>
+        <param name="scale">for java.sql.Types.DECIMAL or java.sql.Types.NUMERIC types,
+                     this is the number of digits after the decimal point.  For all other
+                     types, this value will be ignored.</param>
+        <summary>Sets the value of the designated parameter with the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(int, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setObject(java.lang.String,%20java.lang.Object,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setObject(java.lang.String, java.lang.Object, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -3805,14 +3748,13 @@
         <Parameter Name="x" Type="Java.Sql.IRowId" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setRowId(int,%20java.sql.RowId)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setRowId(int, java.sql.RowId)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setRowId(java.lang.String,%20java.sql.RowId)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setRowId(java.lang.String, java.sql.RowId)</code>.</a>
             </format>
           </para>
           <para>
@@ -3895,15 +3837,13 @@
         <Parameter Name="x" Type="System.Int16" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;short&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;short&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setShort(int,%20short)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setShort(int, short)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setShort(java.lang.String,%20short)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setShort(java.lang.String, short)</code>.</a>
             </format>
           </para>
           <para>
@@ -3985,14 +3925,13 @@
         <Parameter Name="xmlObject" Type="Java.Sql.ISQLXML" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">index of the first parameter is 1, the second is 2, ...</param>
-        <param name="xmlObject">a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an SQL &lt;code&gt;XML&lt;/code&gt; value</param>
+        <param name="parameterName">the name of the parameter</param>
+        <param name="xmlObject">a &lt;code&gt;SQLXML&lt;/code&gt; object that maps an &lt;code&gt;SQL XML&lt;/code&gt; value</param>
         <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setSQLXML(int,%20java.sql.SQLXML)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setSQLXML(int, java.sql.SQLXML)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setSQLXML(java.lang.String,%20java.sql.SQLXML)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setSQLXML(java.lang.String, java.sql.SQLXML)</code>.</a>
             </format>
           </para>
           <para>
@@ -4075,15 +4014,13 @@
         <Parameter Name="x" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given Java &lt;code&gt;String&lt;/code&gt; value.</summary>
+        <summary>Sets the designated parameter to the given Java &lt;code&gt;String&lt;/code&gt; value.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setString(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setString(int, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setString(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setString(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -4167,15 +4104,13 @@
         <Parameter Name="x" Type="Java.Sql.Time" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTime(int,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTime(int, java.sql.Time)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTime(java.lang.String,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTime(java.lang.String, java.sql.Time)</code>.</a>
             </format>
           </para>
           <para>
@@ -4214,15 +4149,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">To be added.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object to use for calculating the time</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+            with the given  &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTime(int,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTime(int, java.sql.Time)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTime(int,%20java.sql.Time,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTime(int, java.sql.Time, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -4262,16 +4197,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="cal">To be added.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the time</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTime(int,%20java.sql.Time)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTime(int, java.sql.Time)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTime(java.lang.String,%20java.sql.Time,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTime(java.lang.String, java.sql.Time, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -4355,15 +4289,13 @@
         <Parameter Name="x" Type="Java.Sql.Timestamp" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTimestamp(int,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTimestamp(int, java.sql.Timestamp)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTimestamp(java.lang.String,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTimestamp(java.lang.String, java.sql.Timestamp)</code>.</a>
             </format>
           </para>
           <para>
@@ -4402,15 +4334,16 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="cal">To be added.</param>
         <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
         <param name="x">the parameter value</param>
+        <param name="cal">the &lt;code&gt;java.util.Calendar&lt;/code&gt; object to use for calculating the
+                   timestamp</param>
         <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+            with the given  &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTimestamp(int,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTimestamp(int, java.sql.Timestamp)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTimestamp(int,%20java.sql.Timestamp,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTimestamp(int, java.sql.Timestamp, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -4450,16 +4383,15 @@
         <Parameter Name="cal" Type="Java.Util.Calendar" />
       </Parameters>
       <Docs>
-        <param name="parameterName">name for parameter</param>
-        <param name="cal">To be added.</param>
-        <param name="parameterIndex">the first parameter is 1, the second is 2, ...</param>
+        <param name="parameterName">the name of the parameter</param>
         <param name="x">the parameter value</param>
-        <summary>Sets the designated parameter in this &lt;code&gt;RowSet&lt;/code&gt; object's command
-            to the given &lt;code&gt;java.</summary>
+        <param name="cal">the &lt;code&gt;Calendar&lt;/code&gt; object the driver will use
+                       to construct the timestamp</param>
+        <summary>Sets the designated parameter to the given &lt;code&gt;java.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTimestamp(int,%20java.sql.Timestamp)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTimestamp(int, java.sql.Timestamp)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/RowSet#setTimestamp(java.lang.String,%20java.sql.Timestamp,%20java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.sql.RowSet.setTimestamp(java.lang.String, java.sql.Timestamp, java.util.Calendar)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml b/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml
index 75cd829d97..b314156f97 100644
--- a/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml
+++ b/docs/Mono.Android/en/Javax.Sql/StatementEvent.xml
@@ -122,17 +122,17 @@
         <Parameter Name="exception" Type="Java.Sql.SQLException" />
       </Parameters>
       <Docs>
-        <param name="exception">To be added.</param>
-        <param name="con">The &lt;code&gt;PooledConnection&lt;/code&gt; that the closed or invalid
-            &lt;code&gt;PreparedStatement&lt;/code&gt;is associated with.</param>
-        <param name="statement">The &lt;code&gt;PreparedStatement&lt;/code&gt; that is bieng closed or is invalid
-            &lt;p&gt;</param>
-        <summary>Constructs a &lt;code&gt;StatementEvent&lt;/code&gt; with the specified &lt;code&gt;PooledConnection&lt;/code&gt; and
-            &lt;code&gt;PreparedStatement&lt;/code&gt;.</summary>
+        <param name="con">The &lt;code&gt;PooledConnection&lt;/code&gt; that the closed or invalid &lt;code&gt;PreparedStatement&lt;/code&gt;
+            is associated with.</param>
+        <param name="statement">The &lt;code&gt;PreparedStatement&lt;/code&gt; that is being closed or is invalid</param>
+        <param name="exception">The &lt;code&gt;SQLException &lt;/code&gt;the driver is about to throw to
+                                                         the application</param>
+        <summary>Constructs a &lt;code&gt;StatementEvent&lt;/code&gt; with the specified &lt;code&gt;PooledConnection&lt;/code&gt;,
+            &lt;code&gt;PreparedStatement&lt;/code&gt; and &lt;code&gt;SQLException&lt;/code&gt;</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/sql/StatementEvent#StatementEvent(javax.sql.PooledConnection,%20java.sql.PreparedStatement)" title="Reference documentation">Java documentation for <code>javax.sql.StatementEvent.StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/sql/StatementEvent#StatementEvent(javax.sql.PooledConnection,%20java.sql.PreparedStatement,%20java.sql.SQLException)" title="Reference documentation">Java documentation for <code>javax.sql.StatementEvent.StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement, java.sql.SQLException)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml
index 69f22f5d94..cc69909134 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeConfigurationException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
+        <param name="cause">The cause.  A &lt;code&gt;null&lt;/code&gt; value is permitted, and indicates that the cause is nonexistent or unknown.</param>
         <summary>Create a new &lt;code&gt;DatatypeConfigurationException&lt;/code&gt; with
-            no specified detail message and cause.</summary>
+            the specified cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConfigurationException#DatatypeConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeConfigurationException.DatatypeConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConfigurationException#DatatypeConfigurationException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeConfigurationException.DatatypeConfigurationException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +126,13 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
+        <param name="message">The detail message.</param>
         <summary>Create a new &lt;code&gt;DatatypeConfigurationException&lt;/code&gt; with
-            no specified detail message and cause.</summary>
+            the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConfigurationException#DatatypeConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeConfigurationException.DatatypeConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConfigurationException#DatatypeConfigurationException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeConfigurationException.DatatypeConfigurationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,14 +188,14 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="cause">To be added.</param>
+        <param name="message">The detail message.</param>
+        <param name="cause">The cause.  A &lt;code&gt;null&lt;/code&gt; value is permitted, and indicates that the cause is nonexistent or unknown.</param>
         <summary>Create a new &lt;code&gt;DatatypeConfigurationException&lt;/code&gt; with
-            no specified detail message and cause.</summary>
+            the specified detail message and cause.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConfigurationException#DatatypeConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeConfigurationException.DatatypeConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConfigurationException#DatatypeConfigurationException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeConfigurationException.DatatypeConfigurationException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml
index d0b97e7040..a8daa4b970 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/DatatypeFactory.xml
@@ -256,16 +256,15 @@
         <Parameter Name="lexicalRepresentation" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="lexicalRepresentation">
-          <c>String</c> representation of a <c>Duration</c>.</param>
-        <param name="durationInMilliSeconds">Duration in milliseconds to create.</param>
+        <param name="lexicalRepresentation">&lt;code&gt;String&lt;/code&gt; representation of a &lt;code&gt;Duration&lt;/code&gt;.</param>
         <summary>Obtain a new instance of a &lt;code&gt;Duration&lt;/code&gt;
-            specifying the &lt;code&gt;Duration&lt;/code&gt; as milliseconds.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; representing &lt;code&gt;durationInMilliSeconds&lt;/code&gt;.</returns>
+            specifying the &lt;code&gt;Duration&lt;/code&gt; as its string representation, "PnYnMnDTnHnMnS",
+            as defined in XML Schema 1.</summary>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created from parsing the &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDuration(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDuration(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDuration(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDuration(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -310,22 +309,21 @@
         <Parameter Name="seconds" Type="Java.Math.BigDecimal" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
-   of the duration is zero, this parameter will be ignored.</param>
-        <param name="years">of this <c>Duration</c></param>
-        <param name="months">of this <c>Duration</c></param>
-        <param name="days">of this <c>Duration</c></param>
-        <param name="hours">of this <c>Duration</c></param>
-        <param name="minutes">of this <c>Duration</c></param>
-        <param name="seconds">of this <c>Duration</c></param>
-        <param name="durationInMilliSeconds">Duration in milliseconds to create.</param>
+        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+              of the duration is zero, this parameter will be ignored.</param>
+        <param name="years">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="months">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="days">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="hours">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="minutes">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="seconds">of this &lt;code&gt;Duration&lt;/code&gt;</param>
         <summary>Obtain a new instance of a &lt;code&gt;Duration&lt;/code&gt;
-            specifying the &lt;code&gt;Duration&lt;/code&gt; as milliseconds.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; representing &lt;code&gt;durationInMilliSeconds&lt;/code&gt;.</returns>
+            specifying the &lt;code&gt;Duration&lt;/code&gt; as isPositive, years, months, days, hours, minutes, seconds.</summary>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created from the specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDuration(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDuration(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDuration(boolean,%20java.math.BigInteger,%20java.math.BigInteger,%20java.math.BigInteger,%20java.math.BigInteger,%20java.math.BigInteger,%20java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDuration(boolean, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigDecimal)</code>.</a>
             </format>
           </para>
           <para>
@@ -369,22 +367,21 @@
         <Parameter Name="seconds" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
-   of the duration is zero, this parameter will be ignored.</param>
-        <param name="years">of this <c>Duration</c></param>
-        <param name="months">of this <c>Duration</c></param>
-        <param name="days">of this <c>Duration</c></param>
-        <param name="hours">of this <c>Duration</c></param>
-        <param name="minutes">of this <c>Duration</c></param>
-        <param name="seconds">of this <c>Duration</c></param>
-        <param name="durationInMilliSeconds">Duration in milliseconds to create.</param>
+        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+              of the duration is zero, this parameter will be ignored.</param>
+        <param name="years">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="months">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="days">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="hours">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="minutes">of this &lt;code&gt;Duration&lt;/code&gt;</param>
+        <param name="seconds">of this &lt;code&gt;Duration&lt;/code&gt;</param>
         <summary>Obtain a new instance of a &lt;code&gt;Duration&lt;/code&gt;
-            specifying the &lt;code&gt;Duration&lt;/code&gt; as milliseconds.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; representing &lt;code&gt;durationInMilliSeconds&lt;/code&gt;.</returns>
+            specifying the &lt;code&gt;Duration&lt;/code&gt; as isPositive, years, months, days, hours, minutes, seconds.</summary>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created from the specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDuration(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDuration(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDuration(boolean,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDuration(boolean, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -464,14 +461,13 @@
       </Parameters>
       <Docs>
         <param name="lexicalRepresentation">Lexical representation of a duration.</param>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified milliseconds as defined in
-            &lt;a href="http://www.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; by parsing its &lt;code&gt;String&lt;/code&gt; representation,
+            "&lt;em&gt;PnDTnHnMnS&lt;/em&gt;", &lt;a href="http://www.</summary>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationDayTime(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationDayTime(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationDayTime(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationDayTime(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -514,20 +510,21 @@
         <Parameter Name="second" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
-   of the duration is zero, this parameter will be ignored.</param>
-        <param name="day">Day of <c>Duration</c>.</param>
-        <param name="hour">Hour of <c>Duration</c>.</param>
-        <param name="minute">Minute of <c>Duration</c>.</param>
-        <param name="second">Second of <c>Duration</c>.</param>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified milliseconds as defined in
+        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+              of the duration is zero, this parameter will be ignored.</param>
+        <param name="day">Day of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="hour">Hour of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="minute">Minute of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="second">Second of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified
+            &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt; and &lt;code&gt;second&lt;/code&gt; as defined in
             &lt;a href="http://www.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt;
+            and &lt;code&gt;second&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationDayTime(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationDayTime(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationDayTime(boolean,%20java.math.BigInteger,%20java.math.BigInteger,%20java.math.BigInteger,%20java.math.BigInteger)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationDayTime(boolean, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger)</code>.</a>
             </format>
           </para>
           <para>
@@ -569,20 +566,21 @@
         <Parameter Name="second" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
-   of the duration is zero, this parameter will be ignored.</param>
-        <param name="day">Day of <c>Duration</c>.</param>
-        <param name="hour">Hour of <c>Duration</c>.</param>
-        <param name="minute">Minute of <c>Duration</c>.</param>
-        <param name="second">Second of <c>Duration</c>.</param>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified milliseconds as defined in
+        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+              of the duration is zero, this parameter will be ignored.</param>
+        <param name="day">Day of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="hour">Hour of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="minute">Minute of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="second">Second of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:dayTimeDuration&lt;/code&gt; using the specified
+            &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt; and &lt;code&gt;second&lt;/code&gt; as defined in
             &lt;a href="http://www.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created with the specified &lt;code&gt;day&lt;/code&gt;, &lt;code&gt;hour&lt;/code&gt;, &lt;code&gt;minute&lt;/code&gt;
+            and &lt;code&gt;second&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationDayTime(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationDayTime(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationDayTime(boolean,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationDayTime(boolean, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -662,14 +660,13 @@
       </Parameters>
       <Docs>
         <param name="lexicalRepresentation">Lexical representation of a duration.</param>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified milliseconds as defined in
-            &lt;a href="http://www.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; by parsing its &lt;code&gt;String&lt;/code&gt; representation,
+            "&lt;em&gt;PnYnM&lt;/em&gt;", &lt;a href="http://www.</summary>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationYearMonth(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationYearMonth(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationYearMonth(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationYearMonth(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -710,18 +707,18 @@
         <Parameter Name="month" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
-   of the duration is zero, this parameter will be ignored.</param>
-        <param name="year">Year of <c>Duration</c>.</param>
-        <param name="month">Month of <c>Duration</c>.</param>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified milliseconds as defined in
+        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+              of the duration is zero, this parameter will be ignored.</param>
+        <param name="year">Year of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="month">Month of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified
+            &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt; as defined in
             &lt;a href="http://www.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationYearMonth(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationYearMonth(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationYearMonth(boolean,%20java.math.BigInteger,%20java.math.BigInteger)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationYearMonth(boolean, java.math.BigInteger, java.math.BigInteger)</code>.</a>
             </format>
           </para>
           <para>
@@ -761,18 +758,18 @@
         <Parameter Name="month" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="isPositive">Set to <c>false</c> to create a negative duration. When the length
-   of the duration is zero, this parameter will be ignored.</param>
-        <param name="year">Year of <c>Duration</c>.</param>
-        <param name="month">Month of <c>Duration</c>.</param>
-        <param name="durationInMilliseconds">Milliseconds of &lt;code&gt;Duration&lt;/code&gt; to create.</param>
-        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified milliseconds as defined in
+        <param name="isPositive">Set to &lt;code&gt;false&lt;/code&gt; to create a negative duration. When the length
+              of the duration is zero, this parameter will be ignored.</param>
+        <param name="year">Year of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <param name="month">Month of &lt;code&gt;Duration&lt;/code&gt;.</param>
+        <summary>Create a &lt;code&gt;Duration&lt;/code&gt; of type &lt;code&gt;xdt:yearMonthDuration&lt;/code&gt; using the specified
+            &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt; as defined in
             &lt;a href="http://www.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;durationInMilliseconds&lt;/code&gt;.</returns>
+        <returns>New &lt;code&gt;Duration&lt;/code&gt; created using the specified &lt;code&gt;year&lt;/code&gt; and &lt;code&gt;month&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationYearMonth(long)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationYearMonth(long)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newDurationYearMonth(boolean,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newDurationYearMonth(boolean, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -853,12 +850,12 @@
       <Docs>
         <param name="factoryClassName">To be added.</param>
         <param name="classLoader">To be added.</param>
-        <summary>Obtain a new instance of a &lt;code&gt;DatatypeFactory&lt;/code&gt;.</summary>
+        <summary>Returns an instance of the named implementation of <c>DatatypeFactory</c>.</summary>
         <returns>New instance of a &lt;code&gt;DocumentBuilderFactory&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newInstance()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newInstance(java.lang.String,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newInstance(java.lang.String, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -934,15 +931,13 @@
         <Parameter Name="cal" Type="Java.Util.GregorianCalendar" />
       </Parameters>
       <Docs>
-        <param name="cal">
-          <c>java.util.GregorianCalendar</c> used to create <c>XMLGregorianCalendar</c></param>
-        <summary>Create a new instance of an &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; with all date/time datatype fields set to
-              <c>DatatypeConstants#FIELD_UNDEFINED</c> or null.</returns>
+        <param name="cal">&lt;code&gt;java.util.GregorianCalendar&lt;/code&gt; used to create &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;</param>
+        <summary>Create an &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; from a <c>GregorianCalendar</c>.</summary>
+        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from &lt;code&gt;java.util.GregorianCalendar&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar(java.util.GregorianCalendar)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar(java.util.GregorianCalendar)</code>.</a>
             </format>
           </para>
           <para>
@@ -980,13 +975,12 @@
       </Parameters>
       <Docs>
         <param name="lexicalRepresentation">Lexical representation of one the eight XML Schema date/time datatypes.</param>
-        <summary>Create a new instance of an &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; with all date/time datatype fields set to
-              <c>DatatypeConstants#FIELD_UNDEFINED</c> or null.</returns>
+        <summary>Create a new XMLGregorianCalendar by parsing the String as a lexical representation.</summary>
+        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from the &lt;code&gt;lexicalRepresentation&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1031,21 +1025,21 @@
         <Parameter Name="timezone" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="month">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="day">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="hour">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="minute">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="second">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="fractionalSecond">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="timezone">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <summary>Create a new instance of an &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; with all date/time datatype fields set to
-              <c>DatatypeConstants#FIELD_UNDEFINED</c> or null.</returns>
+        <param name="year">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="month">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="day">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="hour">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="minute">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="second">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="fractionalSecond">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="timezone">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <summary>Constructor allowing for complete value spaces allowed by
+            W3C XML Schema 1.</summary>
+        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar(java.math.BigInteger,%20int,%20int,%20int,%20int,%20int,%20java.math.BigDecimal,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar(java.math.BigInteger, int, int, int, int, int, java.math.BigDecimal, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1092,21 +1086,21 @@
         <Parameter Name="timezone" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="year">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="month">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="day">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="hour">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="minute">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="second">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="millisecond">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <param name="timezone">of <c>XMLGregorianCalendar</c> to be created.</param>
-        <summary>Create a new instance of an &lt;code&gt;XMLGregorianCalendar&lt;/code&gt;.</summary>
-        <returns>New &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; with all date/time datatype fields set to
-              <c>DatatypeConstants#FIELD_UNDEFINED</c> or null.</returns>
+        <param name="year">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="month">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="day">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="hour">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="minute">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="second">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="millisecond">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <param name="timezone">of &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; to be created.</param>
+        <summary>Constructor of value spaces that a
+            &lt;code&gt;java.</summary>
+        <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from specified values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar()" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendar(int,%20int,%20int,%20int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendar(int, int, int, int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1255,17 +1249,17 @@
         <Parameter Name="timezone" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="fractionalSecond">value of <c>null</c> indicates that this optional field is not set.</param>
         <param name="hours">number of hours</param>
         <param name="minutes">number of minutes</param>
         <param name="seconds">number of seconds</param>
+        <param name="fractionalSecond">value of &lt;code&gt;null&lt;/code&gt; indicates that this optional field is not set.</param>
         <param name="timezone">offset in minutes. <c>DatatypeConstants#FIELD_UNDEFINED</c> indicates optional field is not set.</param>
-        <summary>Create a Java instance of XML Schema builtin datatype &lt;code&gt;time&lt;/code&gt;.</summary>
+        <summary>Create a Java instance of XML Schema builtin datatype time.</summary>
         <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from parameter values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendarTime(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendarTime(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendarTime(int,%20int,%20int,%20java.math.BigDecimal,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendarTime(int, int, int, java.math.BigDecimal, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1310,17 +1304,17 @@
         <Parameter Name="timezone" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="milliseconds">number of milliseconds</param>
         <param name="hours">number of hours</param>
         <param name="minutes">number of minutes</param>
         <param name="seconds">number of seconds</param>
+        <param name="milliseconds">number of milliseconds</param>
         <param name="timezone">offset in minutes. <c>DatatypeConstants#FIELD_UNDEFINED</c> indicates optional field is not set.</param>
-        <summary>Create a Java instance of XML Schema builtin datatype &lt;code&gt;time&lt;/code&gt;.</summary>
+        <summary>Create a Java instance of XML Schema builtin datatype time.</summary>
         <returns>&lt;code&gt;XMLGregorianCalendar&lt;/code&gt; created from parameter values.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendarTime(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendarTime(int, int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory#newXMLGregorianCalendarTime(int,%20int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.DatatypeFactory.newXMLGregorianCalendarTime(int, int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml
index aaafe1a565..283418c7b6 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/Duration.xml
@@ -195,12 +195,11 @@
       </Parameters>
       <Docs>
         <param name="date">A date object whose value will be modified.</param>
-        <param name="calendar">A calendar object whose value will be modified.</param>
-        <summary>Adds this duration to a <c>Calendar</c> object.</summary>
+        <summary>Adds this duration to a <c>Date</c> object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/Duration#addTo(java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.Duration.addTo(java.util.Calendar)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/Duration#addTo(java.util.Date)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.Duration.addTo(java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -465,14 +464,14 @@
         <param name="startInstant">The length of a month/year varies. The &lt;code&gt;startInstant&lt;/code&gt; is
                  used to disambiguate this variance. Specifically, this method
                  returns the difference between &lt;code&gt;startInstant&lt;/code&gt; and
-                 &lt;code&gt;startInstant+duration&lt;/code&gt;</param>
+                 &lt;code&gt;startInstant+duration&lt;/code&gt;.</param>
         <summary>Returns the length of the duration in milliseconds.</summary>
         <returns>milliseconds between &lt;code&gt;startInstant&lt;/code&gt; and
               &lt;code&gt;startInstant&lt;/code&gt; plus this &lt;code&gt;Duration&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/Duration#getTimeInMillis(java.util.Calendar)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.Duration.getTimeInMillis(java.util.Calendar)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/Duration#getTimeInMillis(java.util.Date)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.Duration.getTimeInMillis(java.util.Date)</code>.</a>
             </format>
           </para>
           <para>
@@ -798,14 +797,14 @@
         <Parameter Name="factor" Type="Java.Math.BigDecimal" />
       </Parameters>
       <Docs>
-        <param name="factor">Factor times longer of new &lt;code&gt;Duration&lt;/code&gt; to create.</param>
+        <param name="factor">to multiply by</param>
         <summary>Computes a new duration whose value is &lt;code&gt;factor&lt;/code&gt; times
             longer than the value of this duration.</summary>
-        <returns>New &lt;code&gt;Duration&lt;/code&gt; that is &lt;code&gt;factor&lt;/code&gt;times longer than this &lt;code&gt;Duration&lt;/code&gt;.</returns>
+        <returns>returns a non-null valid &lt;code&gt;Duration&lt;/code&gt; object</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/Duration#multiply(int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.Duration.multiply(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/Duration#multiply(java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.Duration.multiply(java.math.BigDecimal)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml b/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml
index 3a5f533a53..175d9e0ec0 100644
--- a/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Datatype/XMLGregorianCalendar.xml
@@ -997,19 +997,20 @@
         <Parameter Name="fractional" Type="Java.Math.BigDecimal" />
       </Parameters>
       <Docs>
-        <param name="fractional">value of <c>null</c> indicates this optional
-   field is not set.</param>
         <param name="hour">value constraints are summarized in
             &lt;a href="#datetimefield-hour"&gt;hour field of date/time field mapping table&lt;/a&gt;.</param>
         <param name="minute">value constraints are summarized in
             &lt;a href="#datetimefield-minute"&gt;minute field of date/time field mapping table&lt;/a&gt;.</param>
         <param name="second">value constraints are summarized in
             &lt;a href="#datetimefield-second"&gt;second field of date/time field mapping table&lt;/a&gt;.</param>
-        <summary>Set time as one unit.</summary>
+        <param name="fractional">value of &lt;code&gt;null&lt;/code&gt; indicates this optional
+              field is not set.</param>
+        <summary>Set time as one unit, including the optional infinite precision
+            fractional seconds.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar#setTime(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.XMLGregorianCalendar.setTime(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar#setTime(int,%20int,%20int,%20java.math.BigDecimal)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.XMLGregorianCalendar.setTime(int, int, int, java.math.BigDecimal)</code>.</a>
             </format>
           </para>
           <para>
@@ -1051,19 +1052,19 @@
         <Parameter Name="millisecond" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="millisecond">value of <see cref="F:Javax.Xml.Datatype.DatatypeConstants.FieldUndefined" /> indicates this
-                    optional field is not set.</param>
         <param name="hour">value constraints are summarized in
             &lt;a href="#datetimefield-hour"&gt;hour field of date/time field mapping table&lt;/a&gt;.</param>
         <param name="minute">value constraints are summarized in
             &lt;a href="#datetimefield-minute"&gt;minute field of date/time field mapping table&lt;/a&gt;.</param>
         <param name="second">value constraints are summarized in
             &lt;a href="#datetimefield-second"&gt;second field of date/time field mapping table&lt;/a&gt;.</param>
-        <summary>Set time as one unit.</summary>
+        <param name="millisecond">value of <c>DatatypeConstants#FIELD_UNDEFINED</c> indicates this
+                               optional field is not set.</param>
+        <summary>Set time as one unit, including optional milliseconds.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar#setTime(int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.XMLGregorianCalendar.setTime(int, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar#setTime(int,%20int,%20int,%20int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.XMLGregorianCalendar.setTime(int, int, int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1102,13 +1103,12 @@
         <Parameter Name="year" Type="Java.Math.BigInteger" />
       </Parameters>
       <Docs>
-        <param name="year">value constraints are summarized in &lt;a href="#datetimefield-year"&gt;year field of date/time field mapping table&lt;/a&gt;.
-              If year is <c>DatatypeConstants#FIELD_UNDEFINED</c>, then eon is set to &lt;code&gt;null&lt;/code&gt;.</param>
-        <summary>Set year of XSD &lt;code&gt;dateTime&lt;/code&gt; year field.</summary>
+        <param name="year">value constraints summarized in &lt;a href="#datetimefield-year"&gt;year field of date/time field mapping table&lt;/a&gt;.</param>
+        <summary>Set low and high order component of XSD &lt;code&gt;dateTime&lt;/code&gt; year field.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar#setYear(int)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.XMLGregorianCalendar.setYear(int)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar#setYear(java.math.BigInteger)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.XMLGregorianCalendar.setYear(java.math.BigInteger)</code>.</a>
             </format>
           </para>
           <para>
@@ -1299,19 +1299,28 @@
         <Parameter Name="defaults" Type="Javax.Xml.Datatype.XMLGregorianCalendar" />
       </Parameters>
       <Docs>
-        <param name="timezone">provide Timezone. <c>null</c> is a legal value.</param>
+        <param name="timezone">provide Timezone. &lt;code&gt;null&lt;/code&gt; is a legal value.</param>
         <param name="aLocale">provide explicit Locale. Use default GregorianCalendar locale if
-                 value is <c>null</c>.</param>
+                            value is &lt;code&gt;null&lt;/code&gt;.</param>
         <param name="defaults">provide default field values to use when corresponding
-                 field for this instance is FIELD_UNDEFINED or null.
-                 If <c>defaults</c>is <c>null</c> or a field
-                 within the specified <c>defaults</c> is undefined,
-                 just use <c>java.util.GregorianCalendar</c> defaults.</param>
-        <summary>
-        </summary>
-        <returns>To be added.</returns>
+                            field for this instance is FIELD_UNDEFINED or null.
+                            If &lt;code&gt;defaults&lt;/code&gt;is &lt;code&gt;null&lt;/code&gt; or a field
+                            within the specified &lt;code&gt;defaults&lt;/code&gt; is undefined,
+                            just use &lt;code&gt;java.util.GregorianCalendar&lt;/code&gt; defaults.</param>
+        <summary>Convert this &lt;code&gt;XMLGregorianCalendar&lt;/code&gt; along with provided parameters
+            to a <c>GregorianCalendar</c> instance.</summary>
+        <returns>a java.util.GregorianCalendar conversion of this instance.</returns>
         <remarks>
-          <para>Portions of this page are modifications based on work created and shared by the <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format> and used according to terms described in the <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
+          <para>
+            <format type="text/html">
+              <a href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar#toGregorianCalendar(java.util.TimeZone,%20java.util.Locale,%20javax.xml.datatype.XMLGregorianCalendar)" title="Reference documentation">Java documentation for <code>javax.xml.datatype.XMLGregorianCalendar.toGregorianCalendar(java.util.TimeZone, java.util.Locale, javax.xml.datatype.XMLGregorianCalendar)</code>.</a>
+            </format>
+          </para>
+          <para>
+                    Portions of this page are modifications based on work created and shared by the 
+                    <format type="text/html"><a href="https://developers.google.com/terms/site-policies" title="Android Open Source Project">Android Open Source Project</a></format>
+                     and used according to terms described in the 
+                    <format type="text/html"><a href="https://creativecommons.org/licenses/by/2.5/" title="Creative Commons 2.5 Attribution License">Creative Commons 2.5 Attribution License.</a></format></para>
         </remarks>
         <since version="Added in API level 8" />
       </Docs>
diff --git a/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml b/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml
index fb3cb1235b..23e1301151 100644
--- a/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Namespace/QName.xml
@@ -132,13 +132,14 @@
         <Parameter Name="localPart" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="namespaceURI">To be added.</param>
+        <param name="namespaceURI">Namespace URI of the &lt;code&gt;QName&lt;/code&gt;</param>
         <param name="localPart">local part of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <summary>&lt;code&gt;QName&lt;/code&gt; constructor specifying the local part.</summary>
+        <summary>&lt;code&gt;QName&lt;/code&gt; constructor specifying the Namespace URI
+            and local part.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/namespace/QName#QName(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.namespace.QName.QName(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/namespace/QName#QName(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.namespace.QName.QName(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -173,14 +174,15 @@
         <Parameter Name="prefix" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="namespaceURI">To be added.</param>
-        <param name="prefix">To be added.</param>
+        <param name="namespaceURI">Namespace URI of the &lt;code&gt;QName&lt;/code&gt;</param>
         <param name="localPart">local part of the &lt;code&gt;QName&lt;/code&gt;</param>
-        <summary>&lt;code&gt;QName&lt;/code&gt; constructor specifying the local part.</summary>
+        <param name="prefix">prefix of the &lt;code&gt;QName&lt;/code&gt;</param>
+        <summary>&lt;code&gt;QName&lt;/code&gt; constructor specifying the Namespace URI,
+            local part and prefix.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/namespace/QName#QName(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.namespace.QName.QName(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/namespace/QName#QName(java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.namespace.QName.QName(java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml
index 0e809c0294..882dd75347 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilder.xml
@@ -359,14 +359,13 @@
       </Parameters>
       <Docs>
         <param name="is">InputSource containing the content to be parsed.</param>
-        <param name="f">The file containing the XML to parse.</param>
-        <summary>Parse the content of the given file as an XML document
+        <summary>Parse the content of the given input source as an XML document
             and return a new DOM <c>Document</c> object.</summary>
         <returns>A new DOM Document object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -405,14 +404,14 @@
       </Parameters>
       <Docs>
         <param name="is">InputStream containing the content to be parsed.</param>
-        <param name="f">The file containing the XML to parse.</param>
-        <summary>Parse the content of the given file as an XML document
-            and return a new DOM <c>Document</c> object.</summary>
-        <returns>A new DOM Document object.</returns>
+        <summary>Parse the content of the given &lt;code&gt;InputStream&lt;/code&gt; as an XML
+            document and return a new DOM <c>Document</c> object.</summary>
+        <returns>&lt;code&gt;Document&lt;/code&gt; result of parsing the
+             &lt;code&gt;InputStream&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -451,14 +450,13 @@
       </Parameters>
       <Docs>
         <param name="uri">The location of the content to be parsed.</param>
-        <param name="f">The file containing the XML to parse.</param>
-        <summary>Parse the content of the given file as an XML document
+        <summary>Parse the content of the given URI as an XML document
             and return a new DOM <c>Document</c> object.</summary>
         <returns>A new DOM Document object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -499,14 +497,13 @@
       <Docs>
         <param name="is">InputStream containing the content to be parsed.</param>
         <param name="systemId">Provide a base for resolving relative URIs.</param>
-        <param name="f">The file containing the XML to parse.</param>
-        <summary>Parse the content of the given file as an XML document
-            and return a new DOM <c>Document</c> object.</summary>
+        <summary>Parse the content of the given &lt;code&gt;InputStream&lt;/code&gt; as an
+            XML document and return a new DOM <c>Document</c> object.</summary>
         <returns>A new DOM Document object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder#parse(java.io.InputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilder.parse(java.io.InputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml
index 7decd569ab..e1a87366f8 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/DocumentBuilderFactory.xml
@@ -580,12 +580,12 @@
       <Docs>
         <param name="factoryClassName">To be added.</param>
         <param name="classLoader">To be added.</param>
-        <summary>Returns Android's implementation of <c>DocumentBuilderFactory</c>.</summary>
+        <summary>Returns an instance of the named implementation of <c>DocumentBuilderFactory</c>.</summary>
         <returns>a new DocumentBuilderFactory.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory#newInstance()" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilderFactory.newInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory#newInstance(java.lang.String,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.DocumentBuilderFactory.newInstance(java.lang.String, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml
index d28676904e..26ca83f29e 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/FactoryConfigurationError.xml
@@ -89,13 +89,14 @@
         <Parameter Name="e" Type="Java.Lang.Exception" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="e">The exception to be encapsulated in a
+            FactoryConfigurationError.</param>
+        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with a
+            given &lt;code&gt;Exception&lt;/code&gt; base cause of the error.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError#FactoryConfigurationError()" title="Reference documentation">Java documentation for <code>javax.xml.parsers.FactoryConfigurationError.FactoryConfigurationError()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError#FactoryConfigurationError(java.lang.Exception)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.FactoryConfigurationError.FactoryConfigurationError(java.lang.Exception)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +128,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="msg">The error message for the exception.</param>
+        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with
+            the &lt;code&gt;String &lt;/code&gt; specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError#FactoryConfigurationError()" title="Reference documentation">Java documentation for <code>javax.xml.parsers.FactoryConfigurationError.FactoryConfigurationError()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError#FactoryConfigurationError(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.FactoryConfigurationError.FactoryConfigurationError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -166,14 +167,15 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="msg">To be added.</param>
-        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="e">The exception to be encapsulated in a
+            FactoryConfigurationError</param>
+        <param name="msg">The detail message.</param>
+        <summary>Create a new &lt;code&gt;FactoryConfigurationError&lt;/code&gt; with the
+            given &lt;code&gt;Exception&lt;/code&gt; base cause and detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError#FactoryConfigurationError()" title="Reference documentation">Java documentation for <code>javax.xml.parsers.FactoryConfigurationError.FactoryConfigurationError()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError#FactoryConfigurationError(java.lang.Exception,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.FactoryConfigurationError.FactoryConfigurationError(java.lang.Exception, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml
index b9c62d0c5e..2d0bde2e3f 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/ParserConfigurationException.xml
@@ -88,13 +88,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Create a new &lt;code&gt;ParserConfigurationException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="msg">The error message for the exception.</param>
+        <summary>Create a new &lt;code&gt;ParserConfigurationException&lt;/code&gt; with
+            the &lt;code&gt;String&lt;/code&gt; specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/ParserConfigurationException#ParserConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.parsers.ParserConfigurationException.ParserConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/ParserConfigurationException#ParserConfigurationException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.ParserConfigurationException.ParserConfigurationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml
index a5a084b3b6..820c5c7b6a 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParser.xml
@@ -341,15 +341,14 @@
         <Parameter Name="dh" Type="Org.Xml.Sax.Helpers.DefaultHandler" />
       </Parameters>
       <Docs>
-        <param name="dh">The SAX DefaultHandler to use.</param>
         <param name="f">The file containing the XML to parse</param>
-        <param name="hb">The SAX HandlerBase to use.</param>
+        <param name="dh">The SAX DefaultHandler to use.</param>
         <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+            specified <c>org.xml.sax.helpers.DefaultHandler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.helpers.DefaultHandler)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.helpers.DefaultHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -390,14 +389,14 @@
       </Parameters>
       <Docs>
         <param name="is">The InputSource containing the content to be parsed.</param>
-        <param name="f">The file containing the XML to parse</param>
         <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <summary>Parse the content given <c>org.xml.sax.InputSource</c>
+            as XML using the specified
+            <c>org.xml.sax.HandlerBase</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(org.xml.sax.InputSource,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(org.xml.sax.InputSource, org.xml.sax.HandlerBase)</code>.</a>
             </format>
           </para>
           <para>
@@ -440,14 +439,13 @@
       <Docs>
         <param name="is">The InputSource containing the content to be parsed.</param>
         <param name="dh">The SAX DefaultHandler to use.</param>
-        <param name="f">The file containing the XML to parse</param>
-        <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <summary>Parse the content given <c>org.xml.sax.InputSource</c>
+            as XML using the specified
+            <c>org.xml.sax.helpers.DefaultHandler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(org.xml.sax.InputSource,%20org.xml.sax.helpers.DefaultHandler)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(org.xml.sax.InputSource, org.xml.sax.helpers.DefaultHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -489,14 +487,13 @@
       </Parameters>
       <Docs>
         <param name="is">InputStream containing the content to be parsed.</param>
-        <param name="f">The file containing the XML to parse</param>
         <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <summary>Parse the content of the given <c>java.io.InputStream</c>
+            instance as XML using the specified <c>org.xml.sax.HandlerBase</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.InputStream,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.InputStream, org.xml.sax.HandlerBase)</code>.</a>
             </format>
           </para>
           <para>
@@ -539,14 +536,13 @@
       <Docs>
         <param name="is">InputStream containing the content to be parsed.</param>
         <param name="dh">The SAX DefaultHandler to use.</param>
-        <param name="f">The file containing the XML to parse</param>
-        <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <summary>Parse the content of the given <c>java.io.InputStream</c>
+            instance as XML using the specified
+            <c>org.xml.sax.helpers.DefaultHandler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.InputStream,%20org.xml.sax.helpers.DefaultHandler)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.InputStream, org.xml.sax.helpers.DefaultHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -587,14 +583,14 @@
       </Parameters>
       <Docs>
         <param name="uri">The location of the content to be parsed.</param>
-        <param name="f">The file containing the XML to parse</param>
         <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <summary>Parse the content described by the giving Uniform Resource
+            Identifier (URI) as XML using the specified
+            <c>org.xml.sax.HandlerBase</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.lang.String,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.lang.String, org.xml.sax.HandlerBase)</code>.</a>
             </format>
           </para>
           <para>
@@ -636,14 +632,13 @@
       <Docs>
         <param name="uri">The location of the content to be parsed.</param>
         <param name="dh">The SAX DefaultHandler to use.</param>
-        <param name="f">The file containing the XML to parse</param>
-        <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <summary>Parse the content described by the giving Uniform Resource
+            Identifier (URI) as XML using the specified
+            <c>org.xml.sax.helpers.DefaultHandler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.lang.String,%20org.xml.sax.helpers.DefaultHandler)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.lang.String, org.xml.sax.helpers.DefaultHandler)</code>.</a>
             </format>
           </para>
           <para>
@@ -685,15 +680,14 @@
       </Parameters>
       <Docs>
         <param name="is">InputStream containing the content to be parsed.</param>
-        <param name="systemId">The systemId which is needed for resolving relative URIs.</param>
-        <param name="f">The file containing the XML to parse</param>
         <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <param name="systemId">The systemId which is needed for resolving relative URIs.</param>
+        <summary>Parse the content of the given <c>java.io.InputStream</c>
+            instance as XML using the specified <c>org.xml.sax.HandlerBase</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.InputStream,%20org.xml.sax.HandlerBase,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.InputStream, org.xml.sax.HandlerBase, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -739,14 +733,13 @@
         <param name="is">InputStream containing the content to be parsed.</param>
         <param name="dh">The SAX DefaultHandler to use.</param>
         <param name="systemId">The systemId which is needed for resolving relative URIs.</param>
-        <param name="f">The file containing the XML to parse</param>
-        <param name="hb">The SAX HandlerBase to use.</param>
-        <summary>Parse the content of the file specified as XML using the
-            specified <c>org.xml.sax.HandlerBase</c>.</summary>
+        <summary>Parse the content of the given <c>java.io.InputStream</c>
+            instance as XML using the specified
+            <c>org.xml.sax.helpers.DefaultHandler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.File,%20org.xml.sax.HandlerBase)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.File, org.xml.sax.HandlerBase)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParser#parse(java.io.InputStream,%20org.xml.sax.helpers.DefaultHandler,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParser.parse(java.io.InputStream, org.xml.sax.helpers.DefaultHandler, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml
index 37f175560c..900b361ddb 100644
--- a/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Parsers/SAXParserFactory.xml
@@ -288,12 +288,12 @@
       <Docs>
         <param name="factoryClassName">To be added.</param>
         <param name="classLoader">To be added.</param>
-        <summary>Returns Android's implementation of <c>SAXParserFactory</c>.</summary>
+        <summary>Returns an instance of the named implementation of <c>SAXParserFactory</c>.</summary>
         <returns>a new SAXParserFactory.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory#newInstance()" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParserFactory.newInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory#newInstance(java.lang.String,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>javax.xml.parsers.SAXParserFactory.newInstance(java.lang.String, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml
index df6a729bec..9607079940 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMResult.xml
@@ -100,12 +100,12 @@
         <Parameter Name="node" Type="Org.W3c.Dom.INode" />
       </Parameters>
       <Docs>
-        <param name="node">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="node">The DOM node that will contain the result tree.</param>
+        <summary>Use a DOM node to create a new output target.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult(org.w3c.dom.Node)" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult(org.w3c.dom.Node)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,13 +138,13 @@
         <Parameter Name="nextSibling" Type="Org.W3c.Dom.INode" />
       </Parameters>
       <Docs>
-        <param name="node">To be added.</param>
-        <param name="nextSibling">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="node">The DOM node that will contain the result tree.</param>
+        <param name="nextSibling">The child node where the result nodes should be inserted before.</param>
+        <summary>Use a DOM node to create a new output target specifying the child node where the result nodes should be inserted before.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult(org.w3c.dom.Node,%20org.w3c.dom.Node)" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult(org.w3c.dom.Node, org.w3c.dom.Node)</code>.</a>
             </format>
           </para>
           <para>
@@ -179,13 +179,13 @@
         <Parameter Name="systemId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="node">To be added.</param>
-        <param name="systemId">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="node">The DOM node that will contain the result tree.</param>
+        <param name="systemId">The system identifier which may be used in association with this node.</param>
+        <summary>Use a DOM node to create a new output target with the specified System ID.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult(org.w3c.dom.Node,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult(org.w3c.dom.Node, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -242,14 +242,15 @@
         <Parameter Name="systemId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="node">To be added.</param>
-        <param name="nextSibling">To be added.</param>
-        <param name="systemId">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="node">The DOM node that will contain the result tree.</param>
+        <param name="nextSibling">The child node where the result nodes should be inserted before.</param>
+        <param name="systemId">The system identifier which may be used in association with this node.</param>
+        <summary>Use a DOM node to create a new output target specifying the child node where the result nodes should be inserted before and
+            the specified System ID.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult#DOMResult(org.w3c.dom.Node,%20org.w3c.dom.Node,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMResult.DOMResult(org.w3c.dom.Node, org.w3c.dom.Node, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMSource.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMSource.xml
index 5172228f38..9e89cfec17 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMSource.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Dom/DOMSource.xml
@@ -102,12 +102,12 @@
         <Parameter Name="n" Type="Org.W3c.Dom.INode" />
       </Parameters>
       <Docs>
-        <param name="n">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="n">The DOM node that will contain the Source tree.</param>
+        <summary>Create a new input source with a DOM node.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource#DOMSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMSource.DOMSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource#DOMSource(org.w3c.dom.Node)" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMSource.DOMSource(org.w3c.dom.Node)</code>.</a>
             </format>
           </para>
           <para>
@@ -140,13 +140,14 @@
         <Parameter Name="systemID" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="node">To be added.</param>
-        <param name="systemID">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="node">The DOM node that will contain the Source tree.</param>
+        <param name="systemID">Specifies the base URI associated with node.</param>
+        <summary>Create a new input source with a DOM node, and with the
+            system ID also passed in as the base URI.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource#DOMSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMSource.DOMSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource#DOMSource(org.w3c.dom.Node,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.dom.DOMSource.DOMSource(org.w3c.dom.Node, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml
index 4db832219e..966e1e6dea 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXResult.xml
@@ -100,12 +100,12 @@
         <Parameter Name="handler" Type="Org.Xml.Sax.IContentHandler" />
       </Parameters>
       <Docs>
-        <param name="handler">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="handler">Must be a non-null ContentHandler reference.</param>
+        <summary>Create a SAXResult that targets a SAX2 <c>org.xml.sax.ContentHandler</c>.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult#SAXResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXResult.SAXResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult#SAXResult(org.xml.sax.ContentHandler)" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXResult.SAXResult(org.xml.sax.ContentHandler)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml
index a88b95ac05..4d8b9ebd1c 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXSource.xml
@@ -101,12 +101,13 @@
         <Parameter Name="inputSource" Type="Org.Xml.Sax.InputSource" />
       </Parameters>
       <Docs>
-        <param name="inputSource">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="inputSource">An input source reference that must be non-null
+            and that will be passed to the parse method of the reader.</param>
+        <summary>Create a &lt;code&gt;SAXSource&lt;/code&gt;, using a SAX &lt;code&gt;InputSource&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource#SAXSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXSource.SAXSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource#SAXSource(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXSource.SAXSource(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -139,13 +140,15 @@
         <Parameter Name="inputSource" Type="Org.Xml.Sax.InputSource" />
       </Parameters>
       <Docs>
-        <param name="reader">To be added.</param>
-        <param name="inputSource">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="reader">An XMLReader to be used for the parse.</param>
+        <param name="inputSource">A SAX input source reference that must be non-null
+            and that will be passed to the reader parse method.</param>
+        <summary>Create a &lt;code&gt;SAXSource&lt;/code&gt;, using an <c>org.xml.sax.XMLReader</c>
+            and a SAX InputSource.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource#SAXSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXSource.SAXSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource#SAXSource(org.xml.sax.XMLReader,%20org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXSource.SAXSource(org.xml.sax.XMLReader, org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXTransformerFactory.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXTransformerFactory.xml
index 38a453e3fb..02ff6bbdea 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXTransformerFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Sax/SAXTransformerFactory.xml
@@ -312,13 +312,13 @@
       <Docs>
         <param name="src">The Source of the transformation instructions.</param>
         <summary>Get a TransformerHandler object that can process SAX
-            ContentHandler events into a Result.</summary>
-        <returns>A non-null reference to a TransformerHandler, that may
-            be used as a ContentHandler for SAX parse events.</returns>
+            ContentHandler events into a Result, based on the transformation
+            instructions specified by the argument.</summary>
+        <returns>TransformerHandler ready to transform SAX events.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory#newTransformerHandler()" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXTransformerFactory.newTransformerHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory#newTransformerHandler(javax.xml.transform.Source)" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXTransformerFactory.newTransformerHandler(javax.xml.transform.Source)</code>.</a>
             </format>
           </para>
           <para>
@@ -358,13 +358,12 @@
       <Docs>
         <param name="templates">The compiled transformation instructions.</param>
         <summary>Get a TransformerHandler object that can process SAX
-            ContentHandler events into a Result.</summary>
-        <returns>A non-null reference to a TransformerHandler, that may
-            be used as a ContentHandler for SAX parse events.</returns>
+            ContentHandler events into a Result, based on the Templates argument.</summary>
+        <returns>TransformerHandler ready to transform SAX events.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory#newTransformerHandler()" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXTransformerFactory.newTransformerHandler()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory#newTransformerHandler(javax.xml.transform.Templates)" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXTransformerFactory.newTransformerHandler(javax.xml.transform.Templates)</code>.</a>
             </format>
           </para>
           <para>
@@ -448,14 +447,12 @@
       </Parameters>
       <Docs>
         <param name="templates">The compiled transformation instructions.</param>
-        <param name="src">The Source of the transformation instructions.</param>
-        <summary>Create an XMLFilter that uses the given Source as the
-            transformation instructions.</summary>
+        <summary>Create an XMLFilter, based on the Templates argument.</summary>
         <returns>An XMLFilter object, or null if this feature is not supported.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory#newXMLFilter(javax.xml.transform.Source)" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXTransformerFactory.newXMLFilter(javax.xml.transform.Source)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory#newXMLFilter(javax.xml.transform.Templates)" title="Reference documentation">Java documentation for <code>javax.xml.transform.sax.SAXTransformerFactory.newXMLFilter(javax.xml.transform.Templates)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml
index dc8f43d395..4d796baa22 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamResult.xml
@@ -101,12 +101,12 @@
         <Parameter Name="f" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="f">Must a non-null File reference.</param>
+        <summary>Construct a StreamResult from a File.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -138,12 +138,12 @@
         <Parameter Name="writer" Type="Java.IO.Writer" />
       </Parameters>
       <Docs>
-        <param name="writer">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="writer">A valid Writer reference.</param>
+        <summary>Construct a StreamResult from a character stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult(java.io.Writer)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult(java.io.Writer)</code>.</a>
             </format>
           </para>
           <para>
@@ -175,12 +175,12 @@
         <Parameter Name="outputStream" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="outputStream">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="outputStream">A valid OutputStream reference.</param>
+        <summary>Construct a StreamResult from a byte stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult(java.io.OutputStream)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult(java.io.OutputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -212,12 +212,12 @@
         <Parameter Name="systemId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="systemId">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="systemId">Must be a String that conforms to the URI syntax.</param>
+        <summary>Construct a StreamResult from a URL.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#StreamResult(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.StreamResult(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -445,8 +445,10 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="f">Must a non-null File reference.</param>
-        <summary>Get the system identifier that was set with setSystemId. -or- Set the system ID from a &lt;code&gt;File&lt;/code&gt; reference.</summary>
+        <param name="systemId">The system identifier as a URI string.</param>
+        <summary>Get the system identifier that was set with setSystemId. -or- Set the systemID that may be used in association
+            with the byte or character stream, or, if neither is set, use
+            this value as a writeable URI (probably a file name).</summary>
         <value>The system identifier that was set with setSystemId, or null
             if setSystemId was not called.</value>
         <remarks>
@@ -459,7 +461,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#setSystemId(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.setSystemId(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult#setSystemId(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamResult.setSystemId(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamSource.xml b/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamSource.xml
index 8334f5b4c3..3168b4ea7e 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamSource.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform.Stream/StreamSource.xml
@@ -102,12 +102,12 @@
         <Parameter Name="f" Type="Java.IO.File" />
       </Parameters>
       <Docs>
-        <param name="f">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="f">Must a non-null File reference.</param>
+        <summary>Construct a StreamSource from a File.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -139,12 +139,12 @@
         <Parameter Name="reader" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="reader">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="reader">A valid Reader reference to an XML character stream.</param>
+        <summary>Construct a StreamSource from a character reader.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource(java.io.Reader)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource(java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -176,12 +176,12 @@
         <Parameter Name="inputStream" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="inputStream">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="inputStream">A valid InputStream reference to an XML stream.</param>
+        <summary>Construct a StreamSource from a byte stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource(java.io.InputStream)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -213,12 +213,12 @@
         <Parameter Name="systemId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="systemId">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="systemId">Must be a String that conforms to the URI syntax.</param>
+        <summary>Construct a StreamSource from a URL.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -251,13 +251,13 @@
         <Parameter Name="systemId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="reader">To be added.</param>
-        <param name="systemId">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="reader">A valid Reader reference to an XML character stream.</param>
+        <param name="systemId">Must be a String that conforms to the URI syntax.</param>
+        <summary>Construct a StreamSource from a character reader.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource(java.io.Reader,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource(java.io.Reader, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -313,13 +313,13 @@
         <Parameter Name="systemId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="inputStream">To be added.</param>
-        <param name="systemId">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="inputStream">A valid InputStream reference to an XML stream.</param>
+        <param name="systemId">Must be a String that conforms to the URI syntax.</param>
+        <summary>Construct a StreamSource from a byte stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource()" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#StreamSource(java.io.InputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.StreamSource(java.io.InputStream, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -620,8 +620,8 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <param name="f">Must a non-null File reference.</param>
-        <summary>Get the system identifier that was set with setSystemId. -or- Set the system ID from a File reference.</summary>
+        <param name="systemId">The system identifier as a URL string.</param>
+        <summary>Get the system identifier that was set with setSystemId. -or- Set the system identifier for this Source.</summary>
         <value>The system identifier that was set with setSystemId, or null
             if setSystemId was not called.</value>
         <remarks>
@@ -634,7 +634,7 @@
           <para>Property setter documentation:</para>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#setSystemId(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.setSystemId(java.io.File)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource#setSystemId(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.stream.StreamSource.setSystemId(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml
index 62d1de88a2..d4d08ba3aa 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerConfigurationException.xml
@@ -88,13 +88,14 @@
         <Parameter Name="e" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="e">The exception to be encapsulated in a
+            TransformerConfigurationException.</param>
+        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with a
+            given &lt;code&gt;Exception&lt;/code&gt; base cause of the error.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -126,13 +127,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="msg">The error message for the exception.</param>
+        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with
+            the &lt;code&gt;String &lt;/code&gt; specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -188,14 +189,15 @@
         <Parameter Name="e" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <param name="e">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="e">The exception to be encapsulated in a
+                 TransformerConfigurationException</param>
+        <param name="msg">The detail message.</param>
+        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with the
+            given &lt;code&gt;Exception&lt;/code&gt; base cause and detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -228,14 +230,13 @@
         <Parameter Name="locator" Type="Javax.Xml.Transform.ISourceLocator" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="locator">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="message">The error or warning message.</param>
+        <param name="locator">The locator object for the error or warning.</param>
+        <summary>Create a new TransformerConfigurationException from a message and a Locator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException(java.lang.String,%20javax.xml.transform.SourceLocator)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException(java.lang.String, javax.xml.transform.SourceLocator)</code>.</a>
             </format>
           </para>
           <para>
@@ -269,15 +270,15 @@
         <Parameter Name="e" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="locator">To be added.</param>
-        <param name="e">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerConfigurationException&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="message">The error or warning message, or null to
+                           use the message from the embedded exception.</param>
+        <param name="locator">The locator object for the error or warning.</param>
+        <param name="e">Any exception.</param>
+        <summary>Wrap an existing exception in a TransformerConfigurationException.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException#TransformerConfigurationException(java.lang.String,%20javax.xml.transform.SourceLocator,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerConfigurationException.TransformerConfigurationException(java.lang.String, javax.xml.transform.SourceLocator, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml
index bf1e7a337e..f9ab6c5bff 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerException.xml
@@ -55,13 +55,12 @@
         <Parameter Name="e" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="message">The error or warning message.</param>
-        <summary>Create a new TransformerException.</summary>
+        <param name="e">The exception to be wrapped.</param>
+        <summary>Create a new TransformerException wrapping an existing exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -154,13 +153,14 @@
         <Parameter Name="e" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="message">The error or warning message.</param>
-        <summary>Create a new TransformerException.</summary>
+        <param name="message">The error or warning message, or null to
+                           use the message from the embedded exception.</param>
+        <param name="e">Any exception</param>
+        <summary>Wrap an existing exception in a TransformerException.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.String,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.String, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
@@ -193,13 +193,13 @@
         <Parameter Name="locator" Type="Javax.Xml.Transform.ISourceLocator" />
       </Parameters>
       <Docs>
-        <param name="locator">To be added.</param>
         <param name="message">The error or warning message.</param>
-        <summary>Create a new TransformerException.</summary>
+        <param name="locator">The locator object for the error or warning.</param>
+        <summary>Create a new TransformerException from a message and a Locator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.String,%20javax.xml.transform.SourceLocator)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.String, javax.xml.transform.SourceLocator)</code>.</a>
             </format>
           </para>
           <para>
@@ -233,14 +233,15 @@
         <Parameter Name="e" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="locator">To be added.</param>
-        <param name="e">To be added.</param>
-        <param name="message">The error or warning message.</param>
-        <summary>Create a new TransformerException.</summary>
+        <param name="message">The error or warning message, or null to
+                           use the message from the embedded exception.</param>
+        <param name="locator">The locator object for the error or warning.</param>
+        <param name="e">Any exception</param>
+        <summary>Wrap an existing exception in a TransformerException.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerException#TransformerException(java.lang.String,%20javax.xml.transform.SourceLocator,%20java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerException.TransformerException(java.lang.String, javax.xml.transform.SourceLocator, java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml
index 6e68a8d1ac..4545e68b5e 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactory.xml
@@ -401,12 +401,12 @@
       <Docs>
         <param name="factoryClassName">To be added.</param>
         <param name="classLoader">To be added.</param>
-        <summary>Returns Android's implementation of <c>TransformerFactory</c>.</summary>
+        <summary>Returns an instance of the named implementation of <c>TransformerFactory</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory#newInstance()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactory.newInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory#newInstance(java.lang.String,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactory.newInstance(java.lang.String, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -532,21 +532,21 @@
         <Parameter Name="source" Type="Javax.Xml.Transform.ISource" />
       </Parameters>
       <Docs>
-        <param name="source">
-          <c>Source </c> of XSLT document used to create
-   <c>Transformer</c>.
-   Examples of XML <c>Source</c>s include
-   <see cref="T:Javax.Xml.Transform.Stream.StreamSource" />,
-   <see cref="T:Javax.Xml.Transform.Sax.SAXSource" /> and
-   <see cref="T:Javax.Xml.Transform.Dom.DOMSource" />.</param>
-        <summary>Create a new &lt;code&gt;Transformer&lt;/code&gt; that performs a copy
-            of the &lt;code&gt;Source&lt;/code&gt; to the &lt;code&gt;Result&lt;/code&gt;.</summary>
-        <returns>A Transformer object that may be used to perform a transformation
-            in a single thread, never null.</returns>
+        <param name="source">&lt;code&gt;Source &lt;/code&gt; of XSLT document used to create
+              &lt;code&gt;Transformer&lt;/code&gt;.
+              Examples of XML &lt;code&gt;Source&lt;/code&gt;s include
+              <c>javax.xml.transform.stream.StreamSource StreamSource</c>,
+              <c>javax.xml.transform.sax.SAXSource SAXSource</c> and
+              <c>javax.xml.transform.dom.DOMSource DOMSource</c>.</param>
+        <summary>Process the &lt;code&gt;Source&lt;/code&gt; into a &lt;code&gt;Transformer&lt;/code&gt;
+            &lt;code&gt;Object&lt;/code&gt;.</summary>
+        <returns>A &lt;code&gt;Transformer&lt;/code&gt; object that may be used to perform
+              a transformation in a single &lt;code&gt;Thread&lt;/code&gt;, never
+              &lt;code&gt;null&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory#newTransformer()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactory.newTransformer()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory#newTransformer(javax.xml.transform.Source)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactory.newTransformer(javax.xml.transform.Source)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml
index d2a46a0a6d..77ac0013f3 100644
--- a/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Transform/TransformerFactoryConfigurationError.xml
@@ -89,13 +89,14 @@
         <Parameter Name="e" Type="Java.Lang.Exception" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="e">The exception to be encapsulated in a
+            TransformerFactoryConfigurationError.</param>
+        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with a
+            given &lt;code&gt;Exception&lt;/code&gt; base cause of the error.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactoryConfigurationError#TransformerFactoryConfigurationError()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactoryConfigurationError.TransformerFactoryConfigurationError()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactoryConfigurationError#TransformerFactoryConfigurationError(java.lang.Exception)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactoryConfigurationError.TransformerFactoryConfigurationError(java.lang.Exception)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,13 +128,13 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="msg">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="msg">The error message for the exception.</param>
+        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with
+            the &lt;code&gt;String&lt;/code&gt; specified as an error message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactoryConfigurationError#TransformerFactoryConfigurationError()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactoryConfigurationError.TransformerFactoryConfigurationError()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactoryConfigurationError#TransformerFactoryConfigurationError(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactoryConfigurationError.TransformerFactoryConfigurationError(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -166,14 +167,15 @@
         <Parameter Name="msg" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="msg">To be added.</param>
-        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with no
-            detail message.</summary>
+        <param name="e">The exception to be encapsulated in a
+            TransformerFactoryConfigurationError</param>
+        <param name="msg">The detail message.</param>
+        <summary>Create a new &lt;code&gt;TransformerFactoryConfigurationError&lt;/code&gt; with the
+            given &lt;code&gt;Exception&lt;/code&gt; base cause and detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactoryConfigurationError#TransformerFactoryConfigurationError()" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactoryConfigurationError.TransformerFactoryConfigurationError()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/transform/TransformerFactoryConfigurationError#TransformerFactoryConfigurationError(java.lang.Exception,%20java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.transform.TransformerFactoryConfigurationError.TransformerFactoryConfigurationError(java.lang.Exception, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml b/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml
index 8326fc82fc..6aa1751299 100644
--- a/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Validation/SchemaFactory.xml
@@ -370,19 +370,18 @@
         <Parameter Name="classLoader" Type="Java.Lang.ClassLoader" />
       </Parameters>
       <Docs>
-        <param name="factoryClassName">To be added.</param>
-        <param name="classLoader">To be added.</param>
         <param name="schemaLanguage">Specifies the schema language which the returned
                  SchemaFactory will understand. See
                  &lt;a href="#schemaLanguage"&gt;the list of available
                  schema languages&lt;/a&gt; for the possible values.</param>
-        <summary>Lookup an implementation of the &lt;code&gt;SchemaFactory&lt;/code&gt; that supports the specified
-            schema language and return it.</summary>
+        <param name="factoryClassName">To be added.</param>
+        <param name="classLoader">To be added.</param>
+        <summary>Returns an instance of the named implementation of <c>SchemaFactory</c>.</summary>
         <returns>New instance of a &lt;code&gt;SchemaFactory&lt;/code&gt;</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newInstance(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newInstance(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newInstance(java.lang.String,%20java.lang.String,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newInstance(java.lang.String, java.lang.String, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
@@ -461,12 +460,12 @@
       </Parameters>
       <Docs>
         <param name="schema">File that represents a schema.</param>
-        <summary>Creates a special <c>Schema</c> object.</summary>
-        <returns>Always return non-null valid <c>Schema</c> object.</returns>
+        <summary>Parses the specified &lt;code&gt;File&lt;/code&gt; as a schema and returns it as a &lt;code&gt;Schema&lt;/code&gt;.</summary>
+        <returns>New &lt;code&gt;Schema&lt;/code&gt; from parsing &lt;code&gt;schema&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema()" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema(java.io.File)" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema(java.io.File)</code>.</a>
             </format>
           </para>
           <para>
@@ -504,14 +503,13 @@
         <Parameter Name="schema" Type="Java.Net.URL" />
       </Parameters>
       <Docs>
-        <param name="schema">
-          <c>URL</c> that represents a schema.</param>
-        <summary>Creates a special <c>Schema</c> object.</summary>
-        <returns>Always return non-null valid <c>Schema</c> object.</returns>
+        <param name="schema">&lt;code&gt;URL&lt;/code&gt; that represents a schema.</param>
+        <summary>Parses the specified &lt;code&gt;URL&lt;/code&gt; as a schema and returns it as a &lt;code&gt;Schema&lt;/code&gt;.</summary>
+        <returns>New &lt;code&gt;Schema&lt;/code&gt; from parsing &lt;code&gt;schema&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema()" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema(java.net.URL)" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema(java.net.URL)</code>.</a>
             </format>
           </para>
           <para>
@@ -550,12 +548,12 @@
       </Parameters>
       <Docs>
         <param name="schema">Source that represents a schema.</param>
-        <summary>Creates a special <c>Schema</c> object.</summary>
-        <returns>Always return non-null valid <c>Schema</c> object.</returns>
+        <summary>Parses the specified source as a schema and returns it as a schema.</summary>
+        <returns>New &lt;code&gt;Schema&lt;/code&gt; from parsing &lt;code&gt;schema&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema()" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema(javax.xml.transform.Source)" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema(javax.xml.transform.Source)</code>.</a>
             </format>
           </para>
           <para>
@@ -593,16 +591,19 @@
         <Parameter Name="schemas" Type="Javax.Xml.Transform.ISource[]" />
       </Parameters>
       <Docs>
-        <param name="schemas">inputs to be parsed. <see cref="T:Javax.Xml.Validation.SchemaFactory" /> is required
-      to recognize <see cref="T:Javax.Xml.Transform.Stream.StreamSource" />,
-      <see cref="T:Javax.Xml.Transform.Sax.SAXSource" />,
-      and <see cref="T:Javax.Xml.Transform.Dom.DOMSource" />.</param>
-        <summary>Creates a special <c>Schema</c> object.</summary>
-        <returns>Always return non-null valid <c>Schema</c> object.</returns>
+        <param name="schemas">inputs to be parsed. <c>SchemaFactory</c> is required
+                 to recognize <c>StreamSource</c>,
+                 <c>javax.xml.transform.sax.SAXSource</c>,
+                 and <c>javax.xml.transform.dom.DOMSource</c>.</param>
+        <summary>Parses the specified source(s) as a schema and returns it as a schema.</summary>
+        <returns>Always return a non-null valid <c>Schema</c> object.
+                 Note that when an error has been reported, there is no
+                 guarantee that the returned <c>Schema</c> object is
+                 meaningful.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema()" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory#newSchema(javax.xml.transform.Source[])" title="Reference documentation">Java documentation for <code>javax.xml.validation.SchemaFactory.newSchema(javax.xml.transform.Source[])</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml b/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml
index b646c11901..78f9a57247 100644
--- a/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Validation/Validator.xml
@@ -548,22 +548,23 @@
       </Parameters>
       <Docs>
         <param name="source">XML to be validated. Must not be null.</param>
-        <param name="result">The <see cref="T:Javax.Xml.Transform.Result" /> object that receives (possibly augmented)
-      XML. This parameter can be null if the caller is not interested
-      in it.
-
-      Note that when a <see cref="T:Javax.Xml.Transform.Dom.DOMResult" /> is used,
-      a validator might just pass the same DOM node from
-      <see cref="T:Javax.Xml.Transform.Dom.DOMSource" /> to
-      <see cref="T:Javax.Xml.Transform.Dom.DOMResult" />
-      (in which case <c>source.getNode()==result.getNode()</c>),
-      it might copy the entire DOM tree, or it might alter the
-      node given by the source.</param>
-        <summary>Validates the specified input.</summary>
+        <param name="result">The <c>Result</c> object that receives (possibly augmented)
+                 XML. This parameter can be null if the caller is not interested
+                 in it.
+            
+                 Note that when a <c>javax.xml.transform.dom.DOMResult</c> is used,
+                 a validator might just pass the same DOM node from
+                 <c>javax.xml.transform.dom.DOMSource</c> to
+                 <c>javax.xml.transform.dom.DOMResult</c>
+                 (in which case <c>source.getNode()==result.getNode()</c>),
+                 it might copy the entire DOM tree, or it might alter the
+                 node given by the source.</param>
+        <summary>Validates the specified input and send the augmented validation
+            result to the specified output.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/validation/Validator#validate(javax.xml.transform.Source)" title="Reference documentation">Java documentation for <code>javax.xml.validation.Validator.validate(javax.xml.transform.Source)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/validation/Validator#validate(javax.xml.transform.Source,%20javax.xml.transform.Result)" title="Reference documentation">Java documentation for <code>javax.xml.validation.Validator.validate(javax.xml.transform.Source, javax.xml.transform.Result)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml
index f3f6335742..d8b9557d91 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPath.xml
@@ -156,16 +156,16 @@
         <Parameter Name="source" Type="Org.Xml.Sax.InputSource" />
       </Parameters>
       <Docs>
-        <param name="source">The <c>InputSource</c> of the document to evaluate over.</param>
         <param name="expression">The XPath expression.</param>
-        <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate an XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
+        <param name="source">The &lt;code&gt;InputSource&lt;/code&gt; of the document to evaluate over.</param>
+        <summary>Evaluate an XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt;
+            and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
         <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and
               converting the result to a &lt;code&gt;String&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPath#evaluate(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPath#evaluate(java.lang.String,%20org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPath.evaluate(java.lang.String, org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -205,16 +205,15 @@
         <Parameter Name="returnType" Type="Javax.Xml.Namespace.QName" />
       </Parameters>
       <Docs>
-        <param name="returnType">The desired return type.</param>
         <param name="expression">The XPath expression.</param>
         <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate an XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and
-              converting the result to a &lt;code&gt;String&lt;/code&gt;.</returns>
+        <param name="returnType">The desired return type.</param>
+        <summary>Evaluate an &lt;code&gt;XPath&lt;/code&gt; expression in the specified context and return the result as the specified type.</summary>
+        <returns>Result of evaluating an XPath expression as an &lt;code&gt;Object&lt;/code&gt; of &lt;code&gt;returnType&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPath#evaluate(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPath#evaluate(java.lang.String,%20java.lang.Object,%20javax.xml.namespace.QName)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName)</code>.</a>
             </format>
           </para>
           <para>
@@ -255,17 +254,16 @@
         <Parameter Name="returnType" Type="Javax.Xml.Namespace.QName" />
       </Parameters>
       <Docs>
+        <param name="expression">The XPath expression.</param>
         <param name="source">The input source of the document to evaluate over.</param>
         <param name="returnType">The desired return type.</param>
-        <param name="expression">The XPath expression.</param>
-        <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate an XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and
-              converting the result to a &lt;code&gt;String&lt;/code&gt;.</returns>
+        <summary>Evaluate an XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt;
+            and return the result as the specified type.</summary>
+        <returns>The &lt;code&gt;Object&lt;/code&gt; that encapsulates the result of evaluating the expression.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPath#evaluate(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPath.evaluate(java.lang.String, java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPath#evaluate(java.lang.String,%20org.xml.sax.InputSource,%20javax.xml.namespace.QName)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPath.evaluate(java.lang.String, org.xml.sax.InputSource, javax.xml.namespace.QName)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml
index cffad95a6f..6630a71c60 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/IXPathExpression.xml
@@ -108,15 +108,15 @@
         <Parameter Name="source" Type="Org.Xml.Sax.InputSource" />
       </Parameters>
       <Docs>
-        <param name="source">The <c>InputSource</c> of the document to evaluate over.</param>
-        <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate the compiled XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
+        <param name="source">The &lt;code&gt;InputSource&lt;/code&gt; of the document to evaluate over.</param>
+        <summary>Evaluate the compiled XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt; and return the result as a
+            &lt;code&gt;String&lt;/code&gt;.</summary>
         <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and converting the result to a
               &lt;code&gt;String&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression#evaluate(java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpression.evaluate(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression#evaluate(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpression.evaluate(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
@@ -155,15 +155,15 @@
         <Parameter Name="returnType" Type="Javax.Xml.Namespace.QName" />
       </Parameters>
       <Docs>
-        <param name="returnType">The desired return type.</param>
         <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate the compiled XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and converting the result to a
-              &lt;code&gt;String&lt;/code&gt;.</returns>
+        <param name="returnType">The desired return type.</param>
+        <summary>Evaluate the compiled XPath expression in the specified context and return the result as the specified type.</summary>
+        <returns>The &lt;code&gt;Object&lt;/code&gt; that is the result of evaluating the expression and converting the result to
+              &lt;code&gt;returnType&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression#evaluate(java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpression.evaluate(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression#evaluate(java.lang.Object,%20javax.xml.namespace.QName)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpression.evaluate(java.lang.Object, javax.xml.namespace.QName)</code>.</a>
             </format>
           </para>
           <para>
@@ -203,16 +203,16 @@
         <Parameter Name="returnType" Type="Javax.Xml.Namespace.QName" />
       </Parameters>
       <Docs>
-        <param name="source">The <c>InputSource</c> of the document to evaluate over.</param>
+        <param name="source">The &lt;code&gt;InputSource&lt;/code&gt; of the document to evaluate over.</param>
         <param name="returnType">The desired return type.</param>
-        <param name="item">The starting context (node or node list, for example).</param>
-        <summary>Evaluate the compiled XPath expression in the specified context and return the result as a &lt;code&gt;String&lt;/code&gt;.</summary>
-        <returns>The &lt;code&gt;String&lt;/code&gt; that is the result of evaluating the expression and converting the result to a
-              &lt;code&gt;String&lt;/code&gt;.</returns>
+        <summary>Evaluate the compiled XPath expression in the context of the specified &lt;code&gt;InputSource&lt;/code&gt; and return the result as the
+            specified type.</summary>
+        <returns>The &lt;code&gt;Object&lt;/code&gt; that is the result of evaluating the expression and converting the result to
+              &lt;code&gt;returnType&lt;/code&gt;.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression#evaluate(java.lang.Object)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpression.evaluate(java.lang.Object)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression#evaluate(org.xml.sax.InputSource,%20javax.xml.namespace.QName)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpression.evaluate(org.xml.sax.InputSource, javax.xml.namespace.QName)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml
index 64e5f4f19c..5cc318e45f 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathException.xml
@@ -54,13 +54,12 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <param name="cause">The cause.</param>
+        <summary>Constructs a new &lt;code&gt;XPathException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathException#XPathException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathException.XPathException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathException#XPathException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathException.XPathException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml
index 0131e1b1ca..8b3eb11a11 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathExpressionException.xml
@@ -54,13 +54,12 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathExpressionException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <param name="cause">The cause.</param>
+        <summary>Constructs a new &lt;code&gt;XPathExpressionException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpressionException#XPathExpressionException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpressionException.XPathExpressionException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathExpressionException#XPathExpressionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathExpressionException.XPathExpressionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml
index ea9d6b7414..87ee28d50d 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactory.xml
@@ -410,7 +410,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory#newInstance()" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathFactory.newInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory#newInstance(java.lang.String,%20java.lang.String,%20java.lang.ClassLoader)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathFactory.newInstance(java.lang.String, java.lang.String, java.lang.ClassLoader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml
index d30ca41b13..5f3cd79057 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFactoryConfigurationException.xml
@@ -54,13 +54,12 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathFactoryConfigurationException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <param name="cause">The cause.</param>
+        <summary>Constructs a new &lt;code&gt;XPathFactoryConfigurationException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathFactoryConfigurationException#XPathFactoryConfigurationException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathFactoryConfigurationException.XPathFactoryConfigurationException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathFactoryConfigurationException#XPathFactoryConfigurationException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathFactoryConfigurationException.XPathFactoryConfigurationException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml
index f5d31a56b7..41bf47589d 100644
--- a/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml
+++ b/docs/Mono.Android/en/Javax.Xml.Xpath/XPathFunctionException.xml
@@ -54,13 +54,12 @@
         <Parameter Name="cause" Type="Java.Lang.Throwable" />
       </Parameters>
       <Docs>
-        <param name="cause">To be added.</param>
-        <param name="message">The detail message.</param>
-        <summary>Constructs a new &lt;code&gt;XPathFunctionException&lt;/code&gt; with the specified detail &lt;code&gt;message&lt;/code&gt;.</summary>
+        <param name="cause">The cause.</param>
+        <summary>Constructs a new &lt;code&gt;XPathFunctionException&lt;/code&gt; with the specified &lt;code&gt;cause&lt;/code&gt;.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathFunctionException#XPathFunctionException(java.lang.String)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathFunctionException.XPathFunctionException(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/javax/xml/xpath/XPathFunctionException#XPathFunctionException(java.lang.Throwable)" title="Reference documentation">Java documentation for <code>javax.xml.xpath.XPathFunctionException.XPathFunctionException(java.lang.Throwable)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/IX509HostnameVerifier.xml b/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/IX509HostnameVerifier.xml
index 88c1d3c718..1d3873987c 100644
--- a/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/IX509HostnameVerifier.xml
+++ b/docs/Mono.Android/en/Org.Apache.Http.Conn.Ssl/IX509HostnameVerifier.xml
@@ -77,12 +77,8 @@
         <Parameter Name="cert" Type="Java.Security.Cert.X509Certificate" />
       </Parameters>
       <Docs>
-        <param name="cert">To be added.</param>
-        <param name="cns">CN fields, in order, as extracted from the X.509
-                               certificate.</param>
-        <param name="subjectAlts">Subject-Alt fields of type 2 ("DNS"), as extracted
-                               from the X.509 certificate.</param>
         <param name="host">The hostname to verify.</param>
+        <param name="cert">To be added.</param>
         <summary>Checks to see if the supplied hostname matches any of the supplied CNs
             or "DNS" Subject-Alts.</summary>
         <remarks>
@@ -132,12 +128,8 @@
         <Parameter Name="session" Type="Javax.Net.Ssl.ISSLSession" />
       </Parameters>
       <Docs>
-        <param name="session">the SSL session of the connection.</param>
-        <param name="cns">CN fields, in order, as extracted from the X.509
-                               certificate.</param>
-        <param name="subjectAlts">Subject-Alt fields of type 2 ("DNS"), as extracted
-                               from the X.509 certificate.</param>
         <param name="host">The hostname to verify.</param>
+        <param name="session">the SSL session of the connection.</param>
         <summary>Checks to see if the supplied hostname matches any of the supplied CNs
             or "DNS" Subject-Alts.</summary>
         <returns>To be added.</returns>
@@ -184,12 +176,8 @@
         <Parameter Name="ssl" Type="Javax.Net.Ssl.SSLSocket" />
       </Parameters>
       <Docs>
-        <param name="ssl">To be added.</param>
-        <param name="cns">CN fields, in order, as extracted from the X.509
-                               certificate.</param>
-        <param name="subjectAlts">Subject-Alt fields of type 2 ("DNS"), as extracted
-                               from the X.509 certificate.</param>
         <param name="host">The hostname to verify.</param>
+        <param name="ssl">To be added.</param>
         <summary>Checks to see if the supplied hostname matches any of the supplied CNs
             or "DNS" Subject-Alts.</summary>
         <remarks>
diff --git a/docs/Mono.Android/en/Org.Apache.Http.Conn/ConnectTimeoutException.xml b/docs/Mono.Android/en/Org.Apache.Http.Conn/ConnectTimeoutException.xml
index 528b5c3dc1..bb2bb740ea 100644
--- a/docs/Mono.Android/en/Org.Apache.Http.Conn/ConnectTimeoutException.xml
+++ b/docs/Mono.Android/en/Org.Apache.Http.Conn/ConnectTimeoutException.xml
@@ -100,12 +100,12 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Creates a ConnectTimeoutException with a <c>null</c> detail message.</summary>
+        <param name="message">The exception detail message</param>
+        <summary>Creates a ConnectTimeoutException with the specified detail message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/apache/http/conn/ConnectTimeoutException#ConnectTimeoutException()" title="Reference documentation">Java documentation for <code>org.apache.http.conn.ConnectTimeoutException.ConnectTimeoutException()</code>.</a>
+              <a href="https://developer.android.com/reference/org/apache/http/conn/ConnectTimeoutException#ConnectTimeoutException(java.lang.String)" title="Reference documentation">Java documentation for <code>org.apache.http.conn.ConnectTimeoutException.ConnectTimeoutException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Json/JSONArray.xml b/docs/Mono.Android/en/Org.Json/JSONArray.xml
index a0d7d3e2cb..011e960678 100644
--- a/docs/Mono.Android/en/Org.Json/JSONArray.xml
+++ b/docs/Mono.Android/en/Org.Json/JSONArray.xml
@@ -88,11 +88,11 @@
       </Parameters>
       <Docs>
         <param name="array">To be added.</param>
-        <summary>Creates a <c>JSONArray</c> with no values.</summary>
+        <summary>Creates a new <c>JSONArray</c> with values from the given primitive array.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray()" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray(java.lang.Object)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +124,14 @@
         <Parameter Name="readFrom" Type="Org.Json.JSONTokener" />
       </Parameters>
       <Docs>
-        <param name="readFrom">To be added.</param>
-        <summary>Creates a <c>JSONArray</c> with no values.</summary>
+        <param name="readFrom">a tokener whose nextValue() method will yield a
+                <c>JSONArray</c>.</param>
+        <summary>Creates a new <c>JSONArray</c> with values from the next array in the
+            tokener.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray()" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray(org.json.JSONTokener)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray(org.json.JSONTokener)</code>.</a>
             </format>
           </para>
           <para>
@@ -164,12 +166,15 @@
         <Parameter Name="copyFrom" Type="System.Collections.ICollection" />
       </Parameters>
       <Docs>
-        <param name="copyFrom">To be added.</param>
-        <summary>Creates a <c>JSONArray</c> with no values.</summary>
+        <param name="copyFrom">a collection whose values are of supported types.
+                Unsupported values are not permitted and will yield an array in an
+                inconsistent state.</param>
+        <summary>Creates a new <c>JSONArray</c> by copying all values from the given
+            collection.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray()" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray(java.util.Collection)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray(java.util.Collection)</code>.</a>
             </format>
           </para>
           <para>
@@ -201,12 +206,12 @@
         <Parameter Name="json" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="json">To be added.</param>
-        <summary>Creates a <c>JSONArray</c> with no values.</summary>
+        <param name="json">a JSON-encoded string containing an array.</param>
+        <summary>Creates a new <c>JSONArray</c> with values from the JSON string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray()" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#JSONArray(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.JSONArray(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -867,7 +872,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#optBoolean(int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optBoolean(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#optBoolean(int,%20boolean)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optBoolean(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -953,7 +958,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#optDouble(int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optDouble(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#optDouble(int,%20double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optDouble(int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1039,7 +1044,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#optInt(int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optInt(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#optInt(int,%20int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optInt(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1207,7 +1212,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#optLong(int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optLong(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#optLong(int,%20long)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optLong(int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1293,7 +1298,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#optString(int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optString(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#optString(int,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.optString(int, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1328,14 +1333,17 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
-                <c>Double#isInfinite() infinities</c>.</param>
+        <param name="value">a <c>JSONObject</c>, <c>JSONArray</c>, String, Boolean,
+                Integer, Long, Double, <c>JSONObject#NULL</c>, or <c>null</c>. May
+                not be <c>Double#isNaN() NaNs</c> or <c>Double#isInfinite()
+                infinities</c>. Unsupported values are not permitted and will cause the
+                array to be in an inconsistent state.</param>
         <summary>Appends <c>value</c> to the end of this array.</summary>
         <returns>this array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(java.lang.Object)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1377,7 +1385,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(boolean)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1462,7 +1470,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1504,7 +1512,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(long)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1541,14 +1549,17 @@
       </Parameters>
       <Docs>
         <param name="index">To be added.</param>
-        <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
-                <c>Double#isInfinite() infinities</c>.</param>
-        <summary>Appends <c>value</c> to the end of this array.</summary>
+        <param name="value">a <c>JSONObject</c>, <c>JSONArray</c>, String, Boolean,
+                Integer, Long, Double, <c>JSONObject#NULL</c>, or <c>null</c>. May
+                not be <c>Double#isNaN() NaNs</c> or <c>Double#isInfinite()
+                infinities</c>.</param>
+        <summary>Sets the value at <c>index</c> to <c>value</c>, null padding this array
+            to the required length if necessary.</summary>
         <returns>this array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(int,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(int, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1588,12 +1599,13 @@
         <param name="index">To be added.</param>
         <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
                 <c>Double#isInfinite() infinities</c>.</param>
-        <summary>Appends <c>value</c> to the end of this array.</summary>
+        <summary>Sets the value at <c>index</c> to <c>value</c>, null padding this array
+            to the required length if necessary.</summary>
         <returns>this array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(int,%20boolean)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(int, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1633,12 +1645,13 @@
         <param name="index">To be added.</param>
         <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
                 <c>Double#isInfinite() infinities</c>.</param>
-        <summary>Appends <c>value</c> to the end of this array.</summary>
+        <summary>Sets the value at <c>index</c> to <c>value</c>, null padding this array
+            to the required length if necessary.</summary>
         <returns>this array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(int,%20double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(int, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1678,12 +1691,13 @@
         <param name="index">To be added.</param>
         <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
                 <c>Double#isInfinite() infinities</c>.</param>
-        <summary>Appends <c>value</c> to the end of this array.</summary>
+        <summary>Sets the value at <c>index</c> to <c>value</c>, null padding this array
+            to the required length if necessary.</summary>
         <returns>this array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(int,%20int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(int, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1723,12 +1737,13 @@
         <param name="index">To be added.</param>
         <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
                 <c>Double#isInfinite() infinities</c>.</param>
-        <summary>Appends <c>value</c> to the end of this array.</summary>
+        <summary>Sets the value at <c>index</c> to <c>value</c>, null padding this array
+            to the required length if necessary.</summary>
         <returns>this array.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#put(double)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#put(int,%20long)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.put(int, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1911,14 +1926,14 @@
       </Parameters>
       <Docs>
         <param name="indentSpaces">the number of spaces to indent for each level of
-     nesting.
-</param>
-        <summary>Encodes this array as a compact JSON string, such as:</summary>
+                nesting.</param>
+        <summary>Encodes this array as a human readable JSON string for debugging, such
+            as:</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONArray#toString()" title="Reference documentation">Java documentation for <code>org.json.JSONArray.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONArray#toString(int)" title="Reference documentation">Java documentation for <code>org.json.JSONArray.toString(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Json/JSONObject.xml b/docs/Mono.Android/en/Org.Json/JSONObject.xml
index 3c1a01dd92..cb169190e1 100644
--- a/docs/Mono.Android/en/Org.Json/JSONObject.xml
+++ b/docs/Mono.Android/en/Org.Json/JSONObject.xml
@@ -87,12 +87,14 @@
         <Parameter Name="readFrom" Type="Org.Json.JSONTokener" />
       </Parameters>
       <Docs>
-        <param name="readFrom">To be added.</param>
-        <summary>Creates a <c>JSONObject</c> with no name/value mappings.</summary>
+        <param name="readFrom">a tokener whose nextValue() method will yield a
+                <c>JSONObject</c>.</param>
+        <summary>Creates a new <c>JSONObject</c> with name/value mappings from the next
+            object in the tokener.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject()" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject(org.json.JSONTokener)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject(org.json.JSONTokener)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,12 +129,14 @@
         <Parameter Name="copyFrom" Type="System.Collections.IDictionary" />
       </Parameters>
       <Docs>
-        <param name="copyFrom">To be added.</param>
-        <summary>Creates a <c>JSONObject</c> with no name/value mappings.</summary>
+        <param name="copyFrom">a map whose keys are of type <c>String</c> and whose
+                values are of supported types.</param>
+        <summary>Creates a new <c>JSONObject</c> by copying all name/value mappings from
+            the given map.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject()" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject(java.util.Map)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject(java.util.Map)</code>.</a>
             </format>
           </para>
           <para>
@@ -166,12 +170,13 @@
         <Parameter Name="json" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="json">To be added.</param>
-        <summary>Creates a <c>JSONObject</c> with no name/value mappings.</summary>
+        <param name="json">a JSON-encoded string containing an object.</param>
+        <summary>Creates a new <c>JSONObject</c> with name/value mappings from the JSON
+            string.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject()" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -208,11 +213,12 @@
       <Docs>
         <param name="copyFrom">To be added.</param>
         <param name="names">To be added.</param>
-        <summary>Creates a <c>JSONObject</c> with no name/value mappings.</summary>
+        <summary>Creates a new <c>JSONObject</c> by copying mappings for the listed names
+            from the given object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject()" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#JSONObject(org.json.JSONObject,%20java.lang.String[])" title="Reference documentation">Java documentation for <code>org.json.JSONObject.JSONObject(org.json.JSONObject, java.lang.String[])</code>.</a>
             </format>
           </para>
           <para>
@@ -1065,12 +1071,12 @@
         <param name="name">To be added.</param>
         <param name="fallback">To be added.</param>
         <summary>Returns the value mapped by <c>name</c> if it exists and is a boolean or
-            can be coerced to a boolean, or false otherwise.</summary>
+            can be coerced to a boolean, or <c>fallback</c> otherwise.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#optBoolean(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optBoolean(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#optBoolean(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optBoolean(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1151,12 +1157,12 @@
         <param name="name">To be added.</param>
         <param name="fallback">To be added.</param>
         <summary>Returns the value mapped by <c>name</c> if it exists and is a double or
-            can be coerced to a double, or <c>NaN</c> otherwise.</summary>
+            can be coerced to a double, or <c>fallback</c> otherwise.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#optDouble(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optDouble(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#optDouble(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optDouble(java.lang.String, double)</code>.</a>
             </format>
           </para>
           <para>
@@ -1237,12 +1243,12 @@
         <param name="name">To be added.</param>
         <param name="fallback">To be added.</param>
         <summary>Returns the value mapped by <c>name</c> if it exists and is an int or
-            can be coerced to an int, or 0 otherwise.</summary>
+            can be coerced to an int, or <c>fallback</c> otherwise.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#optInt(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optInt(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#optInt(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optInt(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1405,12 +1411,12 @@
         <param name="name">To be added.</param>
         <param name="fallback">To be added.</param>
         <summary>Returns the value mapped by <c>name</c> if it exists and is a long or
-            can be coerced to a long, or 0 otherwise.</summary>
+            can be coerced to a long, or <c>fallback</c> otherwise.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#optLong(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optLong(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#optLong(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optLong(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1491,12 +1497,12 @@
         <param name="name">To be added.</param>
         <param name="fallback">To be added.</param>
         <summary>Returns the value mapped by <c>name</c> if it exists, coercing it if
-            necessary, or the empty string if no such mapping exists.</summary>
+            necessary, or <c>fallback</c> if no such mapping exists.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#optString(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optString(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#optString(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.optString(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1533,15 +1539,17 @@
       </Parameters>
       <Docs>
         <param name="name">To be added.</param>
-        <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
-                <c>Double#isInfinite() infinities</c>.</param>
+        <param name="value">a <c>JSONObject</c>, <c>JSONArray</c>, String, Boolean,
+                Integer, Long, Double, <c>#NULL</c>, or <c>null</c>. May not be
+                <c>Double#isNaN() NaNs</c> or <c>Double#isInfinite()
+                infinities</c>.</param>
         <summary>Maps <c>name</c> to <c>value</c>, clobbering any existing name/value
             mapping with the same name.</summary>
         <returns>this object.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -1587,7 +1595,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20boolean)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -1679,7 +1687,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20int)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, int)</code>.</a>
             </format>
           </para>
           <para>
@@ -1725,7 +1733,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20double)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#put(java.lang.String,%20long)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.put(java.lang.String, long)</code>.</a>
             </format>
           </para>
           <para>
@@ -1995,14 +2003,14 @@
       </Parameters>
       <Docs>
         <param name="indentSpaces">the number of spaces to indent for each level of
-     nesting.
-</param>
-        <summary>Encodes this object as a compact JSON string, such as:</summary>
+                nesting.</param>
+        <summary>Encodes this object as a human readable JSON string for debugging, such
+            as:</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONObject#toString()" title="Reference documentation">Java documentation for <code>org.json.JSONObject.toString()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONObject#toString(int)" title="Reference documentation">Java documentation for <code>org.json.JSONObject.toString(int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Json/JSONStringer.xml b/docs/Mono.Android/en/Org.Json/JSONStringer.xml
index 4029f3f987..44376397d7 100644
--- a/docs/Mono.Android/en/Org.Json/JSONStringer.xml
+++ b/docs/Mono.Android/en/Org.Json/JSONStringer.xml
@@ -396,14 +396,15 @@
         <Parameter Name="value" Type="Java.Lang.Object" />
       </Parameters>
       <Docs>
-        <param name="value">a finite value. May not be <c>Double#isNaN() NaNs</c> or
-                <c>Double#isInfinite() infinities</c>.</param>
-        <summary>Encodes <c>value</c> to this stringer.</summary>
+        <param name="value">a <c>JSONObject</c>, <c>JSONArray</c>, String, Boolean,
+                Integer, Long, Double or null. May not be <c>Double#isNaN() NaNs</c>
+                or <c>Double#isInfinite() infinities</c>.</param>
+        <summary>Encodes <c>value</c>.</summary>
         <returns>this stringer.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONStringer#value(double)" title="Reference documentation">Java documentation for <code>org.json.JSONStringer.value(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONStringer#value(java.lang.Object)" title="Reference documentation">Java documentation for <code>org.json.JSONStringer.value(java.lang.Object)</code>.</a>
             </format>
           </para>
           <para>
@@ -446,7 +447,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONStringer#value(double)" title="Reference documentation">Java documentation for <code>org.json.JSONStringer.value(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONStringer#value(boolean)" title="Reference documentation">Java documentation for <code>org.json.JSONStringer.value(boolean)</code>.</a>
             </format>
           </para>
           <para>
@@ -532,7 +533,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONStringer#value(double)" title="Reference documentation">Java documentation for <code>org.json.JSONStringer.value(double)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONStringer#value(long)" title="Reference documentation">Java documentation for <code>org.json.JSONStringer.value(long)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Json/JSONTokener.xml b/docs/Mono.Android/en/Org.Json/JSONTokener.xml
index 3fb502f91f..bb3a3cb926 100644
--- a/docs/Mono.Android/en/Org.Json/JSONTokener.xml
+++ b/docs/Mono.Android/en/Org.Json/JSONTokener.xml
@@ -308,13 +308,12 @@
       </Parameters>
       <Docs>
         <param name="c">To be added.</param>
-        <summary>Returns the next available character, or the null character '\0' if all
-            input has been exhausted.</summary>
+        <summary>Returns the next available character if it equals <c>c</c>.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONTokener#next()" title="Reference documentation">Java documentation for <code>org.json.JSONTokener.next()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONTokener#next(char)" title="Reference documentation">Java documentation for <code>org.json.JSONTokener.next(char)</code>.</a>
             </format>
           </para>
           <para>
@@ -351,13 +350,12 @@
       </Parameters>
       <Docs>
         <param name="length">To be added.</param>
-        <summary>Returns the next available character, or the null character '\0' if all
-            input has been exhausted.</summary>
+        <summary>Returns the next <c>length</c> characters of the input.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONTokener#next()" title="Reference documentation">Java documentation for <code>org.json.JSONTokener.next()</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONTokener#next(int)" title="Reference documentation">Java documentation for <code>org.json.JSONTokener.next(int)</code>.</a>
             </format>
           </para>
           <para>
@@ -520,12 +518,17 @@
       </Parameters>
       <Docs>
         <param name="excluded">To be added.</param>
-        <summary>Equivalent to <c>nextTo(String.valueOf(excluded))</c>.</summary>
-        <returns>To be added.</returns>
+        <summary>Returns the <c>String#trim trimmed</c> string holding the characters up
+            to but not including the first of:
+            &lt;ul&gt;
+              &lt;li&gt;any character in <c>excluded</c>&lt;li&gt;a newline character '\n'
+              &lt;li&gt;a carriage return '\r'
+            &lt;/ul&gt;</summary>
+        <returns>a possibly-empty string</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/json/JSONTokener#nextTo(char)" title="Reference documentation">Java documentation for <code>org.json.JSONTokener.nextTo(char)</code>.</a>
+              <a href="https://developer.android.com/reference/org/json/JSONTokener#nextTo(java.lang.String)" title="Reference documentation">Java documentation for <code>org.json.JSONTokener.nextTo(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Ext/Attributes2Impl.xml b/docs/Mono.Android/en/Org.Xml.Sax.Ext/Attributes2Impl.xml
index 79a9fcff98..e97e847a20 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Ext/Attributes2Impl.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Ext/Attributes2Impl.xml
@@ -104,12 +104,12 @@
         <Parameter Name="atts" Type="Org.Xml.Sax.IAttributes" />
       </Parameters>
       <Docs>
-        <param name="atts">To be added.</param>
-        <summary>Construct a new, empty Attributes2Impl object.</summary>
+        <param name="atts">The existing Attributes object.</param>
+        <summary>Copy an existing Attributes or Attributes2 object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl#Attributes2Impl()" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2Impl.Attributes2Impl()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl#Attributes2Impl(org.xml.sax.Attributes)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2Impl.Attributes2Impl(org.xml.sax.Attributes)</code>.</a>
             </format>
           </para>
           <para>
@@ -326,13 +326,12 @@
       </Parameters>
       <Docs>
         <param name="qName">The XML qualified (prefixed) name.</param>
-        <param name="index">The attribute index (zero-based).</param>
         <summary>Returns the current value of an attribute's "specified" flag.</summary>
         <returns>current flag value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl#isSpecified(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2Impl.isSpecified(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl#isSpecified(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2Impl.isSpecified(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -375,15 +374,14 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty string if
-        the name has no Namespace URI.</param>
+                   the name has no Namespace URI.</param>
         <param name="localName">The attribute's local name.</param>
-        <param name="index">The attribute index (zero-based).</param>
         <summary>Returns the current value of an attribute's "specified" flag.</summary>
         <returns>current flag value</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl#isSpecified(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2Impl.isSpecified(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl#isSpecified(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2Impl.isSpecified(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Ext/DefaultHandler2.xml b/docs/Mono.Android/en/Org.Xml.Sax.Ext/DefaultHandler2.xml
index 343e2c892a..5dae10582e 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Ext/DefaultHandler2.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Ext/DefaultHandler2.xml
@@ -535,30 +535,29 @@
       </Parameters>
       <Docs>
         <param name="name">Identifies the external entity being resolved.
-    Either "[dtd]" for the external subset, or a name starting
-    with "%" to indicate a parameter entity, or else the name of
-    a general entity.  This is never null when invoked by a SAX2
-    parser.</param>
-        <param name="baseURI">The URI with respect to which relative systemIDs
-    are interpreted.  This is always an absolute URI, unless it is
-    null (likely because the XMLReader was given an InputSource without
-  one).  This URI is defined by the XML specification to be the one
-    associated with the "&lt;" starting the relevant declaration.</param>
+               Either "[dtd]" for the external subset, or a name starting
+               with "%" to indicate a parameter entity, or else the name of
+               a general entity.  This is never null when invoked by a SAX2
+               parser.</param>
         <param name="publicId">The public identifier of the external entity being
                referenced (normalized as required by the XML specification), or
                null if none was supplied.</param>
+        <param name="baseURI">The URI with respect to which relative systemIDs
+               are interpreted.  This is always an absolute URI, unless it is
+               null (likely because the XMLReader was given an InputSource without
+             one).  This URI is defined by the XML specification to be the one
+               associated with the "&amp;lt;" starting the relevant declaration.</param>
         <param name="systemId">The system identifier of the external entity
                being referenced; either a relative or absolute URI.
              This is never null when invoked by a SAX2 parser; only declared
                entities, and any external subset, are resolved by such parsers.</param>
-        <summary>Invokes
-            <c>EntityResolver2#resolveEntity EntityResolver2.resolveEntity()</c>
-            with null entity name and base URI.</summary>
+        <summary>Tells the parser to resolve the systemId against the baseURI
+            and read the entity text from that resulting absolute URI.</summary>
         <returns>An InputSource object describing the new input source.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2#resolveEntity(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.DefaultHandler2.resolveEntity(java.lang.String, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2#resolveEntity(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.DefaultHandler2.resolveEntity(java.lang.String, java.lang.String, java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Ext/IAttributes2.xml b/docs/Mono.Android/en/Org.Xml.Sax.Ext/IAttributes2.xml
index 17f8140846..3182d89052 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Ext/IAttributes2.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Ext/IAttributes2.xml
@@ -114,14 +114,13 @@
       </Parameters>
       <Docs>
         <param name="qName">The XML qualified (prefixed) name.</param>
-        <param name="index">The attribute index (zero-based).</param>
         <summary>Returns false unless the attribute was declared in the DTD.</summary>
         <returns>true if the attribute was declared in the DTD,
                    false otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isDeclared(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isDeclared(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isDeclared(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isDeclared(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -161,16 +160,15 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty string if
-        the name has no Namespace URI.</param>
+                   the name has no Namespace URI.</param>
         <param name="localName">The attribute's local name.</param>
-        <param name="index">The attribute index (zero-based).</param>
         <summary>Returns false unless the attribute was declared in the DTD.</summary>
         <returns>true if the attribute was declared in the DTD,
                    false otherwise.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isDeclared(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isDeclared(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isDeclared(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isDeclared(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -255,7 +253,6 @@
       </Parameters>
       <Docs>
         <param name="qName">The XML qualified (prefixed) name.</param>
-        <param name="index">The attribute index (zero-based).</param>
         <summary>Returns true unless the attribute value was provided
             by DTD defaulting.</summary>
         <returns>true if the value was found in the XML text,
@@ -263,7 +260,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isSpecified(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isSpecified(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isSpecified(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isSpecified(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -303,9 +300,8 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty string if
-        the name has no Namespace URI.</param>
+                   the name has no Namespace URI.</param>
         <param name="localName">The attribute's local name.</param>
-        <param name="index">The attribute index (zero-based).</param>
         <summary>Returns true unless the attribute value was provided
             by DTD defaulting.</summary>
         <returns>true if the value was found in the XML text,
@@ -313,7 +309,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isSpecified(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isSpecified(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2#isSpecified(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Attributes2.isSpecified(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Ext/Locator2Impl.xml b/docs/Mono.Android/en/Org.Xml.Sax.Ext/Locator2Impl.xml
index abf545d717..d24b35c675 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Ext/Locator2Impl.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Ext/Locator2Impl.xml
@@ -104,12 +104,12 @@
         <Parameter Name="locator" Type="Org.Xml.Sax.ILocator" />
       </Parameters>
       <Docs>
-        <param name="locator">To be added.</param>
-        <summary>Construct a new, empty Locator2Impl object.</summary>
+        <param name="locator">The existing Locator object.</param>
+        <summary>Copy an existing Locator or Locator2 object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl#Locator2Impl()" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Locator2Impl.Locator2Impl()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl#Locator2Impl(org.xml.sax.Locator)" title="Reference documentation">Java documentation for <code>org.xml.sax.ext.Locator2Impl.Locator2Impl(org.xml.sax.Locator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributeListImpl.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributeListImpl.xml
index 1fd1c11386..6261c671d4 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributeListImpl.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributeListImpl.xml
@@ -114,12 +114,12 @@
         <Parameter Name="atts" Type="Org.Xml.Sax.IAttributeList" />
       </Parameters>
       <Docs>
-        <param name="atts">To be added.</param>
-        <summary>Create an empty attribute list.</summary>
+        <param name="atts">The attribute list to copy</param>
+        <summary>Construct a persistent copy of an existing attribute list.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl#AttributeListImpl()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributeListImpl.AttributeListImpl()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl#AttributeListImpl(org.xml.sax.AttributeList)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributeListImpl.AttributeListImpl(org.xml.sax.AttributeList)</code>.</a>
             </format>
           </para>
           <para>
@@ -380,16 +380,14 @@
       </Parameters>
       <Docs>
         <param name="name">The attribute name.</param>
-        <param name="i">The position of the attribute in the list.</param>
-        <summary>Get the type of an attribute (by position).</summary>
+        <summary>Get the type of an attribute (by name).</summary>
         <returns>The attribute type as a string ("NMTOKEN" for an
                     enumeration, and "CDATA" if no declaration was
-                    read), or null if there is no attribute at
-                    that position.</returns>
+                    read).</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl#getType(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributeListImpl.getType(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl#getType(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributeListImpl.getType(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -483,14 +481,13 @@
       </Parameters>
       <Docs>
         <param name="name">The attribute name.</param>
-        <param name="i">The position of the attribute in the list.</param>
-        <summary>Get the value of an attribute (by position).</summary>
-        <returns>The attribute value as a string, or null if
-                    there is no attribute at that position.</returns>
+        <summary>Get the value of an attribute (by name).</summary>
+        <returns>the named attribute's value or null, if the attribute does not
+                    exist.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl#getValue(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributeListImpl.getValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl#getValue(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributeListImpl.getValue(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributesImpl.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributesImpl.xml
index 6f414a50d2..4b4e03f141 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributesImpl.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/AttributesImpl.xml
@@ -100,12 +100,12 @@
         <Parameter Name="atts" Type="Org.Xml.Sax.IAttributes" />
       </Parameters>
       <Docs>
-        <param name="atts">To be added.</param>
-        <summary>Construct a new, empty AttributesImpl object.</summary>
+        <param name="atts">The existing Attributes object.</param>
+        <summary>Copy an existing Attributes object.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#AttributesImpl()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.AttributesImpl()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#AttributesImpl(org.xml.sax.Attributes)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.AttributesImpl(org.xml.sax.Attributes)</code>.</a>
             </format>
           </para>
           <para>
@@ -302,15 +302,14 @@
       </Parameters>
       <Docs>
         <param name="uri">The attribute's Namespace URI, or the empty
-        string if none is available.</param>
+                   string if none is available.</param>
         <param name="localName">The attribute's local name.</param>
-        <param name="qName">The qualified name.</param>
-        <summary>Look up an attribute's index by qualified (prefixed) name.</summary>
+        <summary>Look up an attribute's index by Namespace name.</summary>
         <returns>The attribute's index, or -1 if none matches.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getIndex(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getIndex(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getIndex(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getIndex(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -488,14 +487,13 @@
       </Parameters>
       <Docs>
         <param name="qName">The qualified name.</param>
-        <param name="index">The attribute's index (zero-based).</param>
-        <summary>Return an attribute's type by index.</summary>
-        <returns>The attribute's type, "CDATA" if the type is unknown, or null
-                    if the index is out of bounds.</returns>
+        <summary>Look up an attribute's type by qualified (prefixed) name.</summary>
+        <returns>The attribute's type, or null if there is no
+                    matching attribute.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getType(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getType(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getType(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getType(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -536,16 +534,15 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty string for a name
-        with no explicit Namespace URI.</param>
+                   with no explicit Namespace URI.</param>
         <param name="localName">The local name.</param>
-        <param name="index">The attribute's index (zero-based).</param>
-        <summary>Return an attribute's type by index.</summary>
-        <returns>The attribute's type, "CDATA" if the type is unknown, or null
-                    if the index is out of bounds.</returns>
+        <summary>Look up an attribute's type by Namespace-qualified name.</summary>
+        <returns>The attribute's type, or null if there is no
+                    matching attribute.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getType(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getType(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getType(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getType(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -676,13 +673,13 @@
       </Parameters>
       <Docs>
         <param name="qName">The qualified name.</param>
-        <param name="index">The attribute's index (zero-based).</param>
-        <summary>Return an attribute's value by index.</summary>
-        <returns>The attribute's value or null if the index is out of bounds.</returns>
+        <summary>Look up an attribute's value by qualified (prefixed) name.</summary>
+        <returns>The attribute's value, or null if there is no
+                    matching attribute.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getValue(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getValue(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getValue(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -723,15 +720,15 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty string for a name
-        with no explicit Namespace URI.</param>
+                   with no explicit Namespace URI.</param>
         <param name="localName">The local name.</param>
-        <param name="index">The attribute's index (zero-based).</param>
-        <summary>Return an attribute's value by index.</summary>
-        <returns>The attribute's value or null if the index is out of bounds.</returns>
+        <summary>Look up an attribute's value by Namespace-qualified name.</summary>
+        <returns>The attribute's value, or null if there is no
+                    matching attribute.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getValue(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl#getValue(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.AttributesImpl.getValue(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/LocatorImpl.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/LocatorImpl.xml
index 8a9c2d6ba3..50a0de73db 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/LocatorImpl.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/LocatorImpl.xml
@@ -100,12 +100,12 @@
         <Parameter Name="locator" Type="Org.Xml.Sax.ILocator" />
       </Parameters>
       <Docs>
-        <param name="locator">To be added.</param>
-        <summary>Zero-argument constructor.</summary>
+        <param name="locator">The locator to copy.</param>
+        <summary>Copy constructor.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl#LocatorImpl()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.LocatorImpl.LocatorImpl()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl#LocatorImpl(org.xml.sax.Locator)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.LocatorImpl.LocatorImpl(org.xml.sax.Locator)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/NamespaceSupport.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/NamespaceSupport.xml
index 5e3827d333..d9a43550a3 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/NamespaceSupport.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/NamespaceSupport.xml
@@ -248,13 +248,13 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI.</param>
-        <summary>Return an enumeration of all prefixes whose declarations are
-            active in the current context.</summary>
+        <summary>Return an enumeration of all prefixes for a given URI whose
+            declarations are active in the current context.</summary>
         <returns>An enumeration of prefixes (never empty).</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport#getPrefixes()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.NamespaceSupport.getPrefixes()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport#getPrefixes(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.NamespaceSupport.getPrefixes(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserAdapter.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserAdapter.xml
index e5469c990c..941d7b3ac8 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserAdapter.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserAdapter.xml
@@ -107,12 +107,12 @@
         <Parameter Name="parser" Type="Org.Xml.Sax.IParser" />
       </Parameters>
       <Docs>
-        <param name="parser">To be added.</param>
+        <param name="parser">The SAX1 parser to embed.</param>
         <summary>Construct a new parser adapter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter#ParserAdapter()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.ParserAdapter.ParserAdapter()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter#ParserAdapter(org.xml.sax.Parser)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.ParserAdapter.ParserAdapter(org.xml.sax.Parser)</code>.</a>
             </format>
           </para>
           <para>
@@ -714,12 +714,11 @@
       </Parameters>
       <Docs>
         <param name="input">An input source for the document.</param>
-        <param name="systemId">The absolute URL of the document.</param>
         <summary>Parse an XML document.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.ParserAdapter.parse(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter#parse(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.ParserAdapter.parse(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserFactory.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserFactory.xml
index 4cc56342f2..70946c45eb 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserFactory.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/ParserFactory.xml
@@ -176,13 +176,13 @@
       </Parameters>
       <Docs>
         <param name="className">A string containing the name of the
-                  SAX parser class.</param>
-        <summary>Create a new SAX parser using the `org.</summary>
+                             SAX parser class.</param>
+        <summary>Create a new SAX parser object using the class name provided.</summary>
         <returns>the newly created parser.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/ParserFactory#makeParser()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.ParserFactory.makeParser()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/ParserFactory#makeParser(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.ParserFactory.makeParser(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLFilterImpl.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLFilterImpl.xml
index 6f37d7ccf4..75def4a50f 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLFilterImpl.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLFilterImpl.xml
@@ -118,12 +118,12 @@
         <Parameter Name="parent" Type="Org.Xml.Sax.IXMLReader" />
       </Parameters>
       <Docs>
-        <param name="parent">To be added.</param>
-        <summary>Construct an empty XML filter, with no parent.</summary>
+        <param name="parent">the XML reader from which this filter receives its events.</param>
+        <summary>Construct an XML filter with the specified parent.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl#XMLFilterImpl()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLFilterImpl.XMLFilterImpl()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl#XMLFilterImpl(org.xml.sax.XMLReader)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLFilterImpl.XMLFilterImpl(org.xml.sax.XMLReader)</code>.</a>
             </format>
           </para>
           <para>
@@ -965,12 +965,11 @@
       </Parameters>
       <Docs>
         <param name="input">The input source for the document entity.</param>
-        <param name="systemId">The system identifier as a fully-qualified URI.</param>
         <summary>Parse a document.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLFilterImpl.parse(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl#parse(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLFilterImpl.parse(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderAdapter.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderAdapter.xml
index f267a3a6ac..0143792c1b 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderAdapter.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderAdapter.xml
@@ -107,12 +107,12 @@
         <Parameter Name="xmlReader" Type="Org.Xml.Sax.IXMLReader" />
       </Parameters>
       <Docs>
-        <param name="xmlReader">To be added.</param>
+        <param name="xmlReader">The SAX2 XMLReader to wrap.</param>
         <summary>Create a new adapter.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter#XMLReaderAdapter()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLReaderAdapter.XMLReaderAdapter()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter#XMLReaderAdapter(org.xml.sax.XMLReader)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLReaderAdapter.XMLReaderAdapter(org.xml.sax.XMLReader)</code>.</a>
             </format>
           </para>
           <para>
@@ -447,12 +447,11 @@
       </Parameters>
       <Docs>
         <param name="input">An input source for the document.</param>
-        <param name="systemId">The absolute URL of the document.</param>
         <summary>Parse the document.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLReaderAdapter.parse(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter#parse(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLReaderAdapter.parse(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderFactory.xml b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderFactory.xml
index 635117131c..0986c8eb6e 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderFactory.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax.Helpers/XMLReaderFactory.xml
@@ -99,16 +99,16 @@
       </Parameters>
       <Docs>
         <param name="className">the name of the class that should be instantiated.
-
- <para tool="javadoc-to-mdoc">Note that this method will not be usable in environments where
- the caller (perhaps an applet) is not permitted to load classes
- dynamically.</para></param>
-        <summary>Attempt to create an XMLReader from system defaults.</summary>
-        <returns>A new XMLReader.</returns>
+            
+            &lt;p&gt;Note that this method will not be usable in environments where
+            the caller (perhaps an applet) is not permitted to load classes
+            dynamically.&lt;/p&gt;</param>
+        <summary>Attempt to create an XML reader from a class name.</summary>
+        <returns>A new XML reader.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderFactory#createXMLReader()" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLReaderFactory.createXMLReader()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderFactory#createXMLReader(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.helpers.XMLReaderFactory.createXMLReader(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/IAttributeList.xml b/docs/Mono.Android/en/Org.Xml.Sax/IAttributeList.xml
index 18daf5fbb5..63295e3dc5 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/IAttributeList.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/IAttributeList.xml
@@ -168,14 +168,13 @@
       </Parameters>
       <Docs>
         <param name="name">The name of the attribute.</param>
-        <param name="i">The index of the attribute in the list (starting at 0).</param>
-        <summary>Return the type of an attribute in the list (by position).</summary>
-        <returns>The attribute type as a string, or
-                    null if the index is out of range.</returns>
+        <summary>Return the type of an attribute in the list (by name).</summary>
+        <returns>The attribute type as a string, or null if no
+                    such attribute exists.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/AttributeList#getType(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.AttributeList.getType(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/AttributeList#getType(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.AttributeList.getType(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -264,14 +263,13 @@
       </Parameters>
       <Docs>
         <param name="name">the name of the attribute to return</param>
-        <param name="i">The index of the attribute in the list (starting at 0).</param>
-        <summary>Return the value of an attribute in the list (by position).</summary>
-        <returns>The attribute value as a string, or
-                    null if the index is out of range.</returns>
+        <summary>Return the value of an attribute in the list (by name).</summary>
+        <returns>The attribute value as a string, or null if
+                    no such attribute exists.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/AttributeList#getValue(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.AttributeList.getValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/AttributeList#getValue(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.AttributeList.getValue(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/IAttributes.xml b/docs/Mono.Android/en/Org.Xml.Sax/IAttributes.xml
index d3fd9b2d49..31046935aa 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/IAttributes.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/IAttributes.xml
@@ -108,16 +108,15 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty string if
-        the name has no Namespace URI.</param>
+                   the name has no Namespace URI.</param>
         <param name="localName">The attribute's local name.</param>
-        <param name="qName">The qualified (prefixed) name.</param>
-        <summary>Look up the index of an attribute by XML qualified (prefixed) name.</summary>
+        <summary>Look up the index of an attribute by Namespace name.</summary>
         <returns>The index of the attribute, or -1 if it does not
                     appear in the list.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getIndex(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getIndex(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getIndex(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getIndex(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -284,14 +283,14 @@
       </Parameters>
       <Docs>
         <param name="qName">The XML qualified name.</param>
-        <param name="index">The attribute index (zero-based).</param>
-        <summary>Look up an attribute's type by index.</summary>
-        <returns>The attribute's type as a string, or null if the
-                    index is out of range.</returns>
+        <summary>Look up an attribute's type by XML qualified (prefixed) name.</summary>
+        <returns>The attribute type as a string, or null if the
+                    attribute is not in the list or if qualified names
+                    are not available.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getType(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getType(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getType(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getType(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -328,16 +327,16 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty String if the
-        name has no Namespace URI.</param>
+                   name has no Namespace URI.</param>
         <param name="localName">The local name of the attribute.</param>
-        <param name="index">The attribute index (zero-based).</param>
-        <summary>Look up an attribute's type by index.</summary>
-        <returns>The attribute's type as a string, or null if the
-                    index is out of range.</returns>
+        <summary>Look up an attribute's type by Namespace name.</summary>
+        <returns>The attribute type as a string, or null if the
+                    attribute is not in the list or if Namespace
+                    processing is not being performed.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getType(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getType(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getType(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getType(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -460,14 +459,14 @@
       </Parameters>
       <Docs>
         <param name="qName">The XML qualified name.</param>
-        <param name="index">The attribute index (zero-based).</param>
-        <summary>Look up an attribute's value by index.</summary>
-        <returns>The attribute's value as a string, or null if the
-                    index is out of range.</returns>
+        <summary>Look up an attribute's value by XML qualified (prefixed) name.</summary>
+        <returns>The attribute value as a string, or null if the
+                    attribute is not in the list or if qualified names
+                    are not available.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getValue(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getValue(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getValue(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -504,16 +503,15 @@
       </Parameters>
       <Docs>
         <param name="uri">The Namespace URI, or the empty String if the
-        name has no Namespace URI.</param>
+                   name has no Namespace URI.</param>
         <param name="localName">The local name of the attribute.</param>
-        <param name="index">The attribute index (zero-based).</param>
-        <summary>Look up an attribute's value by index.</summary>
-        <returns>The attribute's value as a string, or null if the
-                    index is out of range.</returns>
+        <summary>Look up an attribute's value by Namespace name.</summary>
+        <returns>The attribute value as a string, or null if the
+                    attribute is not in the list.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getValue(int)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/Attributes#getValue(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.Attributes.getValue(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/IParser.xml b/docs/Mono.Android/en/Org.Xml.Sax/IParser.xml
index 13746931cf..a4fad9be3f 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/IParser.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/IParser.xml
@@ -73,13 +73,12 @@
       </Parameters>
       <Docs>
         <param name="source">The input source for the top-level of the
-        XML document.</param>
-        <param name="systemId">The system identifier (URI).</param>
-        <summary>Parse an XML document from a system identifier (URI).</summary>
+                   XML document.</param>
+        <summary>Parse an XML document.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/Parser#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.Parser.parse(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/Parser#parse(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>org.xml.sax.Parser.parse(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/IXMLReader.xml b/docs/Mono.Android/en/Org.Xml.Sax/IXMLReader.xml
index bacdf5603f..997bacbf24 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/IXMLReader.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/IXMLReader.xml
@@ -295,13 +295,12 @@
       </Parameters>
       <Docs>
         <param name="input">The input source for the top-level of the
-        XML document.</param>
-        <param name="systemId">The system identifier (URI).</param>
-        <summary>Parse an XML document from a system identifier (URI).</summary>
+                   XML document.</param>
+        <summary>Parse an XML document.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/XMLReader#parse(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.XMLReader.parse(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/XMLReader#parse(org.xml.sax.InputSource)" title="Reference documentation">Java documentation for <code>org.xml.sax.XMLReader.parse(org.xml.sax.InputSource)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/InputSource.xml b/docs/Mono.Android/en/Org.Xml.Sax/InputSource.xml
index 9cbb01d29a..e820f4e9e7 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/InputSource.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/InputSource.xml
@@ -92,12 +92,12 @@
         <Parameter Name="characterStream" Type="Java.IO.Reader" />
       </Parameters>
       <Docs>
-        <param name="characterStream">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="characterStream">The raw character stream containing the document.</param>
+        <summary>Create a new input source with a character stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/InputSource#InputSource()" title="Reference documentation">Java documentation for <code>org.xml.sax.InputSource.InputSource()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/InputSource#InputSource(java.io.Reader)" title="Reference documentation">Java documentation for <code>org.xml.sax.InputSource.InputSource(java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
@@ -133,12 +133,12 @@
         <Parameter Name="byteStream" Type="System.IO.Stream" />
       </Parameters>
       <Docs>
-        <param name="byteStream">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="byteStream">The raw byte stream containing the document.</param>
+        <summary>Create a new input source with a byte stream.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/InputSource#InputSource()" title="Reference documentation">Java documentation for <code>org.xml.sax.InputSource.InputSource()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/InputSource#InputSource(java.io.InputStream)" title="Reference documentation">Java documentation for <code>org.xml.sax.InputSource.InputSource(java.io.InputStream)</code>.</a>
             </format>
           </para>
           <para>
@@ -175,12 +175,12 @@
         <Parameter Name="systemId" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="systemId">To be added.</param>
-        <summary>Zero-argument default constructor.</summary>
+        <param name="systemId">The system identifier (URI).</param>
+        <summary>Create a new input source with a system identifier.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/InputSource#InputSource()" title="Reference documentation">Java documentation for <code>org.xml.sax.InputSource.InputSource()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/InputSource#InputSource(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.InputSource.InputSource(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/SAXException.xml b/docs/Mono.Android/en/Org.Xml.Sax/SAXException.xml
index 16ea16e6aa..8e647e1d10 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/SAXException.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/SAXException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="e" Type="Java.Lang.Exception" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <summary>Create a new SAXException.</summary>
+        <param name="e">The exception to be wrapped in a SAXException.</param>
+        <summary>Create a new SAXException wrapping an existing exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXException#SAXException()" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXException.SAXException()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXException#SAXException(java.lang.Exception)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXException.SAXException(java.lang.Exception)</code>.</a>
             </format>
           </para>
           <para>
@@ -124,12 +124,12 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
+        <param name="message">The error or warning message.</param>
         <summary>Create a new SAXException.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXException#SAXException()" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXException.SAXException()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXException#SAXException(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXException.SAXException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -185,13 +185,13 @@
         <Parameter Name="e" Type="Java.Lang.Exception" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <param name="e">To be added.</param>
-        <summary>Create a new SAXException.</summary>
+        <param name="message">The detail message.</param>
+        <param name="e">The exception to be wrapped in a SAXException.</param>
+        <summary>Create a new SAXException from an existing exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXException#SAXException()" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXException.SAXException()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXException#SAXException(java.lang.String,%20java.lang.Exception)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXException.SAXException(java.lang.String, java.lang.Exception)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/SAXNotRecognizedException.xml b/docs/Mono.Android/en/Org.Xml.Sax/SAXNotRecognizedException.xml
index 5a80f551f1..6adaf88d51 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/SAXNotRecognizedException.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/SAXNotRecognizedException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Default constructor.</summary>
+        <param name="message">The text message of the exception.</param>
+        <summary>Construct a new exception with the given message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXNotRecognizedException#SAXNotRecognizedException()" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXNotRecognizedException.SAXNotRecognizedException()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXNotRecognizedException#SAXNotRecognizedException(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXNotRecognizedException.SAXNotRecognizedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/SAXNotSupportedException.xml b/docs/Mono.Android/en/Org.Xml.Sax/SAXNotSupportedException.xml
index 44a8bd3999..a1d636ffb5 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/SAXNotSupportedException.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/SAXNotSupportedException.xml
@@ -87,12 +87,12 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>Construct a new exception with no message.</summary>
+        <param name="message">The text message of the exception.</param>
+        <summary>Construct a new exception with the given message.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXNotSupportedException#SAXNotSupportedException()" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXNotSupportedException.SAXNotSupportedException()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXNotSupportedException#SAXNotSupportedException(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXNotSupportedException.SAXNotSupportedException(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.Xml.Sax/SAXParseException.xml b/docs/Mono.Android/en/Org.Xml.Sax/SAXParseException.xml
index e7262d5324..5ff2561e25 100644
--- a/docs/Mono.Android/en/Org.Xml.Sax/SAXParseException.xml
+++ b/docs/Mono.Android/en/Org.Xml.Sax/SAXParseException.xml
@@ -78,21 +78,14 @@
         <Parameter Name="locator" Type="Org.Xml.Sax.ILocator" />
       </Parameters>
       <Docs>
-        <param name="locator">To be added.</param>
         <param name="message">The error or warning message.</param>
-        <param name="publicId">The public identifier of the entity that generated
-                            the error or warning.</param>
-        <param name="systemId">The system identifier of the entity that generated
-                            the error or warning.</param>
-        <param name="lineNumber">The line number of the end of the text that
-                              caused the error or warning.</param>
-        <param name="columnNumber">The column number of the end of the text that
-                                cause the error or warning.</param>
-        <summary>Create a new SAXParseException.</summary>
+        <param name="locator">The locator object for the error or warning (may be
+                   null).</param>
+        <summary>Create a new SAXParseException from a message and a Locator.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXParseException#SAXParseException(java.lang.String,%20java.lang.String,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXParseException.SAXParseException(java.lang.String, java.lang.String, java.lang.String, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXParseException#SAXParseException(java.lang.String,%20org.xml.sax.Locator)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXParseException.SAXParseException(java.lang.String, org.xml.sax.Locator)</code>.</a>
             </format>
           </para>
           <para>
@@ -127,22 +120,16 @@
         <Parameter Name="e" Type="Java.Lang.Exception" />
       </Parameters>
       <Docs>
-        <param name="locator">To be added.</param>
-        <param name="e">To be added.</param>
-        <param name="message">The error or warning message.</param>
-        <param name="publicId">The public identifier of the entity that generated
-                            the error or warning.</param>
-        <param name="systemId">The system identifier of the entity that generated
-                            the error or warning.</param>
-        <param name="lineNumber">The line number of the end of the text that
-                              caused the error or warning.</param>
-        <param name="columnNumber">The column number of the end of the text that
-                                cause the error or warning.</param>
-        <summary>Create a new SAXParseException.</summary>
+        <param name="message">The error or warning message, or null to
+                           use the message from the embedded exception.</param>
+        <param name="locator">The locator object for the error or warning (may be
+                   null).</param>
+        <param name="e">Any exception.</param>
+        <summary>Wrap an existing exception in a SAXParseException.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXParseException#SAXParseException(java.lang.String,%20java.lang.String,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXParseException.SAXParseException(java.lang.String, java.lang.String, java.lang.String, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXParseException#SAXParseException(java.lang.String,%20org.xml.sax.Locator,%20java.lang.Exception)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXParseException.SAXParseException(java.lang.String, org.xml.sax.Locator, java.lang.Exception)</code>.</a>
             </format>
           </para>
           <para>
@@ -229,8 +216,8 @@
         <Parameter Name="e" Type="Java.Lang.Exception" />
       </Parameters>
       <Docs>
-        <param name="e">To be added.</param>
-        <param name="message">The error or warning message.</param>
+        <param name="message">The error or warning message, or null to use
+                           the message from the embedded exception.</param>
         <param name="publicId">The public identifier of the entity that generated
                             the error or warning.</param>
         <param name="systemId">The system identifier of the entity that generated
@@ -239,11 +226,12 @@
                               caused the error or warning.</param>
         <param name="columnNumber">The column number of the end of the text that
                                 cause the error or warning.</param>
-        <summary>Create a new SAXParseException.</summary>
+        <param name="e">Another exception to embed in this one.</param>
+        <summary>Create a new SAXParseException with an embedded exception.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xml/sax/SAXParseException#SAXParseException(java.lang.String,%20java.lang.String,%20java.lang.String,%20int,%20int)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXParseException.SAXParseException(java.lang.String, java.lang.String, java.lang.String, int, int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xml/sax/SAXParseException#SAXParseException(java.lang.String,%20java.lang.String,%20java.lang.String,%20int,%20int,%20java.lang.Exception)" title="Reference documentation">Java documentation for <code>org.xml.sax.SAXParseException.SAXParseException(java.lang.String, java.lang.String, java.lang.String, int, int, java.lang.Exception)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.XmlPull.V1/IXmlPullParser.xml b/docs/Mono.Android/en/Org.XmlPull.V1/IXmlPullParser.xml
index 63d3a3e587..cff0c37018 100644
--- a/docs/Mono.Android/en/Org.XmlPull.V1/IXmlPullParser.xml
+++ b/docs/Mono.Android/en/Org.XmlPull.V1/IXmlPullParser.xml
@@ -583,13 +583,12 @@
       <Docs>
         <param name="namespace">Namespace of the attribute if namespaces are enabled otherwise must be null</param>
         <param name="name">If namespaces enabled local name of attribute otherwise just attribute name</param>
-        <param name="index">zero-based index of attribute</param>
-        <summary>Returns the given attributes value.</summary>
-        <returns>value of attribute (null is never returned)</returns>
+        <summary>Returns the attributes value identified by namespace URI and namespace localName.</summary>
+        <returns>value of attribute or null if attribute with given name does not exist</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser#getAttributeValue(int)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParser.getAttributeValue(int)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser#getAttributeValue(java.lang.String,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParser.getAttributeValue(java.lang.String, java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -668,12 +667,13 @@
       </Parameters>
       <Docs>
         <param name="prefix">To be added.</param>
-        <summary>Returns the namespace URI of the current element.</summary>
+        <summary>Returns the URI corresponding to the given prefix,
+            depending on current state of the parser.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser#getNamespace()" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParser.getNamespace()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser#getNamespace(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParser.getNamespace(java.lang.String)</code>.</a>
             </format>
           </para>
           <para>
@@ -1518,14 +1518,12 @@
       </Parameters>
       <Docs>
         <param name="in">To be added.</param>
-        <param name="inputStream">contains a raw byte input stream of possibly
-                unknown encoding (when inputEncoding is null).</param>
-        <param name="inputEncoding">if not null it MUST be used as encoding for inputStream</param>
-        <summary>Sets the input stream the parser is going to process.</summary>
+        <summary>Set the input source for parser to the given reader and
+            resets the parser.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser#setInput(java.io.InputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParser.setInput(java.io.InputStream, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser#setInput(java.io.Reader)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParser.setInput(java.io.Reader)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.XmlPull.V1/IXmlSerializer.xml b/docs/Mono.Android/en/Org.XmlPull.V1/IXmlSerializer.xml
index 9e7ff8ed02..325a3e1011 100644
--- a/docs/Mono.Android/en/Org.XmlPull.V1/IXmlSerializer.xml
+++ b/docs/Mono.Android/en/Org.XmlPull.V1/IXmlSerializer.xml
@@ -706,11 +706,11 @@
       </Parameters>
       <Docs>
         <param name="writer">To be added.</param>
-        <summary>Set to use binary output stream with given encoding.</summary>
+        <summary>Set the output to the given writer.</summary>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer#setOutput(java.io.OutputStream,%20java.lang.String)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlSerializer.setOutput(java.io.OutputStream, java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer#setOutput(java.io.Writer)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlSerializer.setOutput(java.io.Writer)</code>.</a>
             </format>
           </para>
           <para>
@@ -1030,7 +1030,7 @@
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer#text(java.lang.String)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlSerializer.text(java.lang.String)</code>.</a>
+              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer#text(char[],%20int,%20int)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlSerializer.text(char[], int, int)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/Org.XmlPull.V1/XmlPullParserFactory.xml b/docs/Mono.Android/en/Org.XmlPull.V1/XmlPullParserFactory.xml
index 0f892fc5a5..947fc8c122 100644
--- a/docs/Mono.Android/en/Org.XmlPull.V1/XmlPullParserFactory.xml
+++ b/docs/Mono.Android/en/Org.XmlPull.V1/XmlPullParserFactory.xml
@@ -349,13 +349,13 @@
       <Docs>
         <param name="unused">To be added.</param>
         <param name="unused2">To be added.</param>
-        <summary>Creates a new instance of a PullParserFactory that can be used
-            to create XML pull parsers.</summary>
+        <summary>Creates a factory that always returns instances of Android's built-in
+            <c>XmlPullParser</c> and <c>XmlSerializer</c> implementation.</summary>
         <returns>To be added.</returns>
         <remarks>
           <para>
             <format type="text/html">
-              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParserFactory#newInstance()" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParserFactory.newInstance()</code>.</a>
+              <a href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParserFactory#newInstance(java.lang.String,%20java.lang.Class)" title="Reference documentation">Java documentation for <code>org.xmlpull.v1.XmlPullParserFactory.newInstance(java.lang.String, java.lang.Class)</code>.</a>
             </format>
           </para>
           <para>
diff --git a/docs/Mono.Android/en/index.xml b/docs/Mono.Android/en/index.xml
index 9b292dc150..7a1a87d813 100644
--- a/docs/Mono.Android/en/index.xml
+++ b/docs/Mono.Android/en/index.xml
@@ -55,7 +55,7 @@
           <AttributeName>System.Reflection.AssemblyFileVersion("0.1.0.0")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("0.1.24.0 git-rev-head:087684a7 git-branch:main")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("0.1.40.0 git-rev-head:d64087cf git-branch:main")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyMetadata("IsTrimmable", "True")</AttributeName>
@@ -73,7 +73,6 @@
           <AttributeName>System.Runtime.Versioning.TargetFramework("MonoAndroid,Version=v1.0", FrameworkDisplayName="Xamarin.Android Base Class Libraries")</AttributeName>
         </Attribute>
       </Attributes>
-      <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 43 8a c2 a5 ac fb f1 6c bd 2b 2b 47 a6 27 62 f2 73 df 9c b2 79 5c ec cd f7 7d 10 bf 50 8e 69 e7 a3 62 ea 7a 45 45 5b bf 3a c9 55 e1 f2 e2 81 4f 14 4e 5d 81 7e fc 4c 65 02 cc 01 2d f3 10 78 33 48 30 4e 3a e3 85 73 c6 d6 58 c2 34 02 58 21 fd a8 7a 0b e8 a0 d5 04 df 56 4e 2c 93 b2 b8 78 92 5f 42 50 3e 9d 54 df ef 9f 95 86 d9 e6 f3 8a 30 57 69 58 7b 1d e0 1f 6c 04 10 32 8b 2c 97 33 db ]</AssemblyPublicKey>
     </Assembly>
     <Assembly Name="Mono.Android" Version="0.0.0.0">
       <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 43 8a c2 a5 ac fb f1 6c bd 2b 2b 47 a6 27 62 f2 73 df 9c b2 79 5c ec cd f7 7d 10 bf 50 8e 69 e7 a3 62 ea 7a 45 45 5b bf 3a c9 55 e1 f2 e2 81 4f 14 4e 5d 81 7e fc 4c 65 02 cc 01 2d f3 10 78 33 48 30 4e 3a e3 85 73 c6 d6 58 c2 34 02 58 21 fd a8 7a 0b e8 a0 d5 04 df 56 4e 2c 93 b2 b8 78 92 5f 42 50 3e 9d 54 df ef 9f 95 86 d9 e6 f3 8a 30 57 69 58 7b 1d e0 1f 6c 04 10 32 8b 2c 97 33 db ]</AssemblyPublicKey>
@@ -765,9 +764,6 @@
         <Attribute>
           <AttributeName>System.Reflection.AssemblyCompany("Microsoft Corporation")</AttributeName>
         </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("9.1.5.1; git-rev-head:234003d1a; git-branch:HEAD")</AttributeName>
-        </Attribute>
         <Attribute>
           <AttributeName>System.Runtime.CompilerServices.CompilationRelaxations(8)</AttributeName>
         </Attribute>
@@ -895,7 +891,7 @@
           <AttributeName>Android.Runtime.NamespaceMapping(Java="android.window", Managed="Android.Window")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("12.1.99.86; git-rev-head:aea70ca; git-branch:main")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("12.1.99.137; git-rev-head:05dd813; git-branch:main")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyMetadata("IsTrimmable", "True")</AttributeName>
@@ -919,8 +915,6 @@
           <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Mono.Android.NET-Tests, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")</AttributeName>
         </Attribute>
       </Attributes>
-      <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 43 8a c2 a5 ac fb f1 6c bd 2b 2b 47 a6 27 62 f2 73 df 9c b2 79 5c ec cd f7 7d 10 bf 50 8e 69 e7 a3 62 ea 7a 45 45 5b bf 3a c9 55 e1 f2 e2 81 4f 14 4e 5d 81 7e fc 4c 65 02 cc 01 2d f3 10 78 33 48 30 4e 3a e3 85 73 c6 d6 58 c2 34 02 58 21 fd a8 7a 0b e8 a0 d5 04 df 56 4e 2c 93 b2 b8 78 92 5f 42 50 3e 9d 54 df ef 9f 95 86 d9 e6 f3 8a 30 57 69 58 7b 1d e0 1f 6c 04 10 32 8b 2c 97 33 db ]</AssemblyPublicKey>
-      <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 43 8a c2 a5 ac fb f1 6c bd 2b 2b 47 a6 27 62 f2 73 df 9c b2 79 5c ec cd f7 7d 10 bf 50 8e 69 e7 a3 62 ea 7a 45 45 5b bf 3a c9 55 e1 f2 e2 81 4f 14 4e 5d 81 7e fc 4c 65 02 cc 01 2d f3 10 78 33 48 30 4e 3a e3 85 73 c6 d6 58 c2 34 02 58 21 fd a8 7a 0b e8 a0 d5 04 df 56 4e 2c 93 b2 b8 78 92 5f 42 50 3e 9d 54 df ef 9f 95 86 d9 e6 f3 8a 30 57 69 58 7b 1d e0 1f 6c 04 10 32 8b 2c 97 33 db ]</AssemblyPublicKey>
     </Assembly>
   </Assemblies>
   <remarks />